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

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

Change-Id: I60d0b4aaeb7ffcaf43624a8f3cec1d6669c07da0