Merge "Enhance BubbleController dumps" into tm-qpr-dev am: f30746816a

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

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