Merge changes from topic "am-77df3837e6b048d9b616ac822d294fd2" into rvc-qpr-dev-plus-aosp
* changes:
Merge "DO NOT MERGE: Remove storage grant to the content capture service." into rvc-dev am: ad23c8db am: 564806e2 am: 1cb02722
DO NOT MERGE: Remove storage grant to the content capture service. am: 97c5c022 am: bb4b8668 am: cf942524