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

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



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