Merge "Update BP strings" into udc-d1-dev am: b8318c4716 am: 655b738d18

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

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