Merge "Add feature flag for content URI permission APIs" into main am: 9fdbf8e5ac

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

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