Android cts 11.0 release 6
Snap for 6516174 from b6b048f0f38e09396391e61592e779b3ab434bf5 to rvc-release

Change-Id: I6afa460c68308aa6808ab3e1a5e0d123d7efe903