Merge "CDD: Changes related to Scoped Storage" into rvc-dev am: d9029a0ec2

Original change: https://googleplex-android-review.googlesource.com/c/platform/compatibility/cdd/+/11522402

Change-Id: I2606aeb2a10b69e2acbb015fdaa2e340586b533d