Merge "Update BP strings" into udc-d1-dev am: b8318c47 am: b05416e7 am: 4615e3d8

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



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