Android cts 11.0 release 6
Snap for 6210127 from 824fbb7e21ff47001b31682152aecbade46d2193 to rvc-release

Change-Id: Ic4f1920288c08c864e216c8e4dc9c793619b40a6