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

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



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