Merge "Instrument jank of CUJ take screen shot" into tm-dev am: 009099e89d am: caeed3687b am: e0ebf68216 am: 66035c7451
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729988 Change-Id: I4516098485f8cd4a0b212465a10a8afe267b7287 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: