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

[automerger skipped] Merge "Add back enforceReadPermission for getmetadata" into pi-dev am: 63369efd -s ours am: a2165815 -s ours am: 0dfd3dd0 -s ours am: e3eaf4a7 -s ours am: 422df4c4 -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/+/11402658

Change-Id: Ie2a4d70f147f224cf71cb775e828e9b9a66422cc