ub-automotive-master-20231011 (10934312)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24626702'] into car-apps-aosp-release.

Change-Id: I25c922d94e12b99a57b0b1f5f5740f31a2fb26a7