Merge "Move pointer after dismissing un-expanded bubble" into rvc-dev am:...

Merge "Move pointer after dismissing un-expanded bubble" into rvc-dev am: 4eddc200 am: 95db0a04 am: ba8b22c6

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

Change-Id: Icfd969ae4e6aafaafed50d5aec5f1e3c6c139b41