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

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



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