[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: 564806e2 am: 60596caa am: 3bf05011 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I96a3ad5658d2449d9e3fd87a0b8f8d121c16f5cc