Android VTS 14.0 Release 2 (11117384)
Merge sc-mainline-prod

Bug: 189946434
Change-Id: I042f3697acb93059ea10aee2078fd8207cb41c1d