Android CTS 9.0 Release 2 (4999451)
Snap for 4662252 from bf8c1ad2adfe37bae65749ebc46f76c72b475f32 to pi-release

Change-Id: Ied773c8bf4a09e5610c303f088632bc5ddd47daf