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

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

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



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