Android CTS 7.0 Release 28 (5165225)
Merge "Snap for 4402654 from e9ae6ad1ccf985d4697b19172505994d3025c1c3 to nougat-cts-release" into nougat-cts-release