Android VTS 11.0 Release 5 (7599184)
Merge "Snap for 7595615 from e34ed909d92cdf8b6159726b90a82d2327a85b5b to android11-tests-release" into android11-tests-release