Android CTS 13.0 Release 2 (9265165)
Snap for 8006021 from 61fbdb4506a7772a21c6f29568fae33fbc63b24b to tm-release

Change-Id: Idd8b281e09eda36ea80126ef4a4ba9b8253254b6