Android CTS 9.0 Release 15 (7080970)
Snap for 4832339 from 3a1dcff97b22cc566fc33b655d595fcd61dbb42e to pi-release

Change-Id: I1e9d12f483d7f384e06723b434d4172c878b54de