Android CTS 8.1 Release 22 (7116318)
Merge "Snap for 7078052 from 3b1e6518bdd6d48d84ae6ee2a9101351e763c7ca to oreo-mr1-cts-release" into oreo-mr1-cts-release