Merge "Instrument jank of CUJ take screen shot" into tm-dev am: 009099e8 am: caeed368 am: e0ebf682

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17729988



Change-Id: I0e9d1e00dbd7645849080a5b828b422b7848bc56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>