Android VTS 8.0 Release 13 (OVS1.191024.001)
Merge changes Ifc818a69,I433b33d0 am: be20684665 am: 576f858aaa am: e17dd6e292
am: 1da8730be2

Change-Id: I8b569d223dcc896c2fdce51e92d1d4096e9d413e