Android VTS 12.1 Release 3 (8876974)
Merge cherrypicks of [16386054] into sc-v2-release.

Change-Id: I2943ed7e54d663922427c5ec9c9156352bde7904