Android cts 9.0 release 18
Merge "Snap for 5455383 from b1a0c215927dc0b9240c14892e3a041ef850dc57 to pie-cts-release" into pie-cts-release