[automerger skipped] Merge "Fix for CtsScopedStorageHostTest" into rvc-qpr-dev am: cd24854466 -s ours am: efa1a70554 -s ours

am skip reason: skip tag Change-Id I1155b94ef934c7135be6c398aea82d3a1c92c40e with SHA-1 542827bb30 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/13092000

Change-Id: Ieada765d61da0ae8813887bf6870ffb632f7f323