Android CTS 11.0 Release 5 (7640833)
Snap for 6630229 from 7b508d88577f682f3fdcb0dcebe51a7c73521041 to rvc-release

Change-Id: Ia850f8a138cac2211608c7cce8f0ce9e324f62ac