Merge "Merge "Make sure we log the last bubble removal" into udc-dev am:...

Merge "Merge "Make sure we log the last bubble removal" into udc-dev am: 9edab49c am: 3d1e0ac0" into udc-d1-dev-plus-aosp am: 48b240cf

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



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