Android VTS 10.0 Release 6 (6926900)
Merge "Snap for 6381431 from d200d089df63cc7b2d2a24531feb828b5357e60e to android10-tests-release" into android10-tests-release