Merge "Fixed android.appsecurity.cts.StorageHostTest" into sc-v2-dev