[automerger skipped] Merge "[Bouncer] Move bouncer expansion callback out..."...

[automerger skipped] Merge "[Bouncer] Move bouncer expansion callback out..." into tm-qpr-dev am: bb994c9b am: 252ca155 -s ours

am skip reason: Merged-In I07179c68d29d55157439b07ef0b85592b50a39e8 with SHA-1 ef7269c5 is already in history

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



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