Android VTS 9.0 Release 12 (6203387)
Snap for 4396096 from 2edb366074e3c3ce4004f383ef20f598fd19769f to pi-release

Change-Id: I154babd1e6838768347c0607faac1512a6cb9495