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

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



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