[automerger skipped] Merge "More Fixes for CtsScopedStorageHostTest" into rvc-qpr-dev am: 24e2acc8e1 -s ours am: cccd16d6d5 -s ours

am skip reason: skip tag Change-Id I733dca23f710439773f432b2c9b310116097092d with SHA-1 9117fc1359 is already in history

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

Change-Id: Ib2b9a6563047d677f69ff9ca18cd5a8e567a02f5