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