Android CTS 7.1 Release 28 (5730325)
Merge "Snap for 5660618 from 09e9b71758936129088ef94cc6928b47c8afa19d to nougat-mr1-cts-release" into nougat-mr1-cts-release