Android CTS 7.0 Release 28 (5165225)
Merge "Merge cherrypicks of [842443] into nougat-cts-release" into nougat-cts-release