Android CTS 13.0 Release 8 (11681990)
Merge cherrypicks of [19048695] into tm-release.

Change-Id: I603600635f5ec655603af90ad90e9ecfbda483c6