Merge "[Bouncer] Move expansion constant out." into tm-qpr-dev am: 20630764 am: 5206abf6

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



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