Android CTS 9.0 Release 20 (8503603)
Merge "Snap for 7962585 from 9fb91d6a1a9c1f19e81feba080579246c689103f to pie-cts-release" into pie-cts-release