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

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

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