Android CTS 14.0 Release 1 (UP1A.230905.011)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23809847', 'googleplex-android-review.googlesource.com/23864761'] into udc-release.

Change-Id: Ib867e368928a55165608504e58eca8e11cb61310