Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Merge cherrypicks of ['googleplex-android-review.googlesource.com/29668910'] into 24Q3-release. Change-Id: I558f0e74c2c734bc2dc8c90379cb195677f824d9