Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
This is a manual cherry-pick of commit 6a43a06c. Bug: 33352540 Test: Updated existing tests. Change-Id: I990029d2ea9032301362d614959259965b8ecb10