Merge "Add new 10x10 bounding box config option" into udc-qpr-dev am: a228112f am: 8ac6b931

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



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