Merge "Update strings (for media permissions)" into tm-dev am: 04b94c55 am:...

Merge "Update strings (for media permissions)" into tm-dev am: 04b94c55 am: 11a0dafa am: 6d84ba53

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



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