Merge "Update strings based on new product decisions" into udc-dev am:...

Merge "Update strings based on new product decisions" into udc-dev am: 51a83871 am: 7c00cfa9 am: c960420e am: 09a8f78b

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



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