Fix for CTS LegacyStorageTest Bug: 163891184 Bug: 182389935 Test: atest CtsScopedStorageHostTest:android.scopedstorage.cts.host.LegacyStorageHostTest (cherry picked from commit 745aaaeaf70b5b59ab8d6de962929742074a9d41) (cherry picked from commit d1b9e2f8342ce1f096e2d8a869d64b441610775d) Merged-In: Ia6f5398613b48d411ee80256e7fb518c298fcc33 Change-Id: Ia6f5398613b48d411ee80256e7fb518c298fcc33