Android CTS 11.0 Release 2 (6965179)
Merge ab/12162526 into stage-aosp-rvc-ts-dev

Bug: 148878042
Change-Id: Ia93f243b01ddcbd23d5516552b2d492df18c0ade