Android VTS 8.1 Release 3 (4632653)
Snap for 4373604 from b167aa8611f5743093ac14adfe3546fa512c87ad to oc-mr1-release

Change-Id: Ie63704cc7353a73124ad567ccc6be7ee132308dd