Merge "Fix for CTS LegacyStorageTest" am: 442443619b am: 5a60400760 am: 228786ba36

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

Change-Id: Ie2f3858c25295050784c9d7fdec81769e44a1f89