Android VTS 9.0 Release 4 (5007851)
Merge cherrypicks of [4562103, 4560827, 4563998, 4563999, 4564000, 4564001, 4564351, 4564352, 4564333, 4564033, 4560455, 4564034, 4560674, 4560675, 4563620, 4561607, 4561062, 4561063] into pi-release

Change-Id: I8b6494e6539f685ea265cd74dfbfa88ab3cb289f