Merge cherrypicks of ['googleplex-android-review.googlesource.com/35130609'] into security-aosp-24Q3-release. Change-Id: I64c9a39369639a8f9674cbf37d0277087170885d