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