Android 14.0.0 release 36
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26748246', 'googleplex-android-review.googlesource.com/26749309'] into sparse-11677807-L30100030002993307.
SPARSE_CHANGE: Icef538751a8e660862b5c33c2ca4cb225adc9071
SPARSE_CHANGE: If7e8fde69fcac194e57df3ac2a39e91fdb0fbbba

Change-Id: I5e6988788931e749aedd987d1c2a859621fd287f