Android VTS 12.0 Release 2 (7973604)
Snap for 7178253 from 5cbe3fa60bcf50ddfe2da66586e0af1aad19b0ad to sc-release

Change-Id: Ibb2ec1272f1e1560a973f18bdae55adf06a9cdb8