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
Change-Id: I96f1f67802f12472f71f7b2be8ad17361e8f0b6e