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: 2b5176af am: 26aadc1e am: 91b4af6d

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



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