Android CTS 8.1 Release 15 (5455603)
Merge "Snap for 5454552 from c8554db709c03d071dce52586d45dd084cef1837 to oreo-mr1-cts-release" into oreo-mr1-cts-release