Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Cherry-pick from AOSP-Master. am: baf105bf am: 82fafefe am: 75256f10 am: f6318dda Test: Manual Bug: 34469716 Merged-In: Iec7e77bfbf2f0e493d8cc21187baca6a0a7d032d Change-Id: Iec7e77bfbf2f0e493d8cc21187baca6a0a7d032d (cherry picked from commit 44c54a2e)