Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f am: 943d53dd

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

Change-Id: Ic2ae12ef2ed342a8dbdbbc9c3e140ed2dcc6b6ad