Merge "Jank-Instrument all dialogs opened from the shade" into tm-qpr-dev am: d151838b

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



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