[automerger skipped] Merge "DO NOT MERGE: Remove storage grant to the content...

[automerger skipped] Merge "DO NOT MERGE: Remove storage grant to the content capture service." into rvc-dev am: ad23c8db am: 9c7099fb am: e4484442 am: 3f69b558 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I4bd4dc1ac3fa881b26aa9262d076e5922037cde3