Android CTS 11.0 Release 8 (8503871)
Merge cherrypicks of [2063830] into sparse-8430561-L72000000954266199.

Change-Id: Ibf4d941e17146bcd9fd657c04019e40a3b4d644c