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