[automerger skipped] Merge "Fix for CTS LegacyStorageTest" into rvc-qpr-dev am: 561a5fe2b8 -s ours am: 4695b6dd3a -s ours

am skip reason: skip tag Change-Id Ia6f5398613b48d411ee80256e7fb518c298fcc33 with SHA-1 fe84e11c8e is already in history

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

Change-Id: I4aa446c951c688c90a302d95b2289055b541693e