Merge "DO NOT MERGE: Fix android.appsecurity.cts.StorageHostTest#testVerifyStatsMultiple for O" into oreo-cts-dev