[automerger skipped] Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb
am: 76a930705b
-s ours
am skip reason: Merged-In I1e89e99ef11cd1fb64750709e331e1f059d2eeaf with SHA-1 0172ff6942
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175
Change-Id: Ia05e37c76a3049447452b075d36648ba10be19a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: