[automerger skipped] Merge "Add feature flag for content URI permission APIs" into main am: 9fdbf8e5ac am: 23c260ba23 am: 1549a694fa -s ours

am skip reason: Merged-In I277458bb1f6d7ece1f9efc8054a8d3d9b3924000 with SHA-1 ebc8588e45 is already in history

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

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