Merge "Merge "More CTS for APIs used by Mainline." into rvc-dev am: 469263a4...
Merge "Merge "More CTS for APIs used by Mainline." into rvc-dev am: 469263a4 am: cdac1f38" into rvc-d1-dev-plus-aosp am: e2a6e48e am: dbcb0401
Change-Id: Ia481c61683c8234b68ae97b264eefb8bbc479750