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: f1e2a311 am: 01a8616d

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



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