Android CTS 8.1 Release 7 (4855739)
Snap for 4396223 from 20fb29347ff159f8dece43a5e38cfc936ab09054 to oc-mr1-release

Change-Id: I00a85f963062bbe8d642c87cd1cad7de59304ab0