Merge "Fix bubble button alignment" into rvc-qpr-dev am: 2ccb7a087e

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

Change-Id: Id6b9d2ef408c14a9f85f83b981ca0d9f86d48885