Android VTS 14.0 Release 3 (11394979)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: Iae315840f4dac902784fd14ee085f59dd0c7666b