Merge "Align Bubble with Expand Icon" into rvc-dev am: 82b49c00 am: 946bd97f am: 68079549 am: c53d5f96

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

Change-Id: I5a08c1d867d1a91b011363f50aca9def3f11f990