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