Android CTS 7.0 Release 23 (4844168)
Merge "Snap for 4840442 from 352f89e4599031ebd0b37b268599a4b40e610fa7 to nougat-cts-release" into nougat-cts-release