Android cts 11.0 release 6
Snap for 5922838 from 279b6f9c5e6b5fade1ecb2c50b4c773a29fe384c to rvc-release

Change-Id: Ibe519f1a2d18c79ef38a97c86f29fa4bbd97141f