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