Merge "[Bouncer] Move bouncer expansion callback out..." into tm-qpr-dev am: bb994c9b

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



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