Android VTS 11.0 Release 2 (6961477)
Snap for 6582636 from a3bff77ab80eceb0500bd08c38107b3f58ccc632 to rvc-release

Change-Id: Ice40b4ec5cfcf686891e00e5651f5b3d1e50f54f