Android 14.0.0 release 36
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26748772', 'googleplex-android-review.googlesource.com/26749528'] into sparse-11677807-L30100030002993307.
SPARSE_CHANGE: Ibba665e3b6d1b82e443164fcc2674b39b2116da5
SPARSE_CHANGE: I7c4fd9a493d96ba947f0ee12388e2baf775e07c4

Change-Id: I775dfd72bc52c304b2be105cd09b2d96181e18e7