Merge "Fix GSI-CTS test failures on rvc-cuttlefish" into android11-gsi