Merge "[Bouncer] ensure that bouncer expansion callback.." into tm-qpr-dev am:...

Merge "[Bouncer] ensure that bouncer expansion callback.." into tm-qpr-dev am: 837507ea am: 9894fbac

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



Change-Id: I5b298a8ffd038280a3dd472170d00260ceba42bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>