Merge "Added custom bp size." into tm-qpr-dev am: 27693c91 am: c670e525

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



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