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