Android cts 9.0 release 18
Snap for 4442369 from ed7db04ba28abd4cde74af22dc439aa252be49bc to pi-release

Change-Id: Iceb2bdd71856924cd140a6fdd8bf44512d7fc021