DO NOT MERGE. Fix the cts tests

Fixes the tests corresponding to aosp/2080758
Bug: 232733969
Test: cts

Change-Id: Ic11c68ad7d55c588a658f227a912d1ba31dd65a2
(cherry picked from commit 530ba397e18de7db3edfce2fc3495b5a1a8d5fe9)
(cherry picked from commit 069deef7a89bb42878e5f9caf6c497490f6d1f12)
1 file changed