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

Bug: 189946434
Change-Id: Idb72167fcb28bb4ca4bb376470c529b4270efc33