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

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



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