[automerger skipped] Merge "Add back enforceReadPermission for getmetadata"...

[automerger skipped] Merge "Add back enforceReadPermission for getmetadata" into qt-dev am: e8b7bb30 -s ours am: 7ba2192d -s ours am: d2ae8097 -s ours am: 57c685e8 -s ours am: 2a1c2a7a -s ours am: 33ed557d -s ours

am skip reason: Change-Id I4f04f08f76d039196c2c67bac80d4a46ebec87f2 with SHA-1 c9464617 is in history

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

Change-Id: I2fda59ffb92d0ba1403aeba3ac1caac6f2fcf224