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: f6b7fe72

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

Change-Id: Ic9ef71cc409cf5e093c71a492f49401c6b32ac8b