Merge "Align Bubble with Expand Icon" into rvc-dev am: 82b49c00 am: 1141eaed am: 8056f75d am: da55f001

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

Change-Id: I51fa7347ff5b03753b74ae04875336c2ae78a462