Android CTS 9.0 Release 8 (5550264)
Snap for 4801384 from 1bfc3eccb6354c1af6406c03ba6243582204e931 to pi-release

Change-Id: If23a73e98f946a0633d12442834f4f668da945a7