Android CTS 9.0 Release 5 (5131725)
Snap for 4373608 from 8f688823fc5399ab0f42ba2c8986cdd127dbde9b to pi-release

Change-Id: I5ca6e753d515d8687b6f152da2010c2ccf0d584d