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

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



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