resolve merge conflicts of 22ccf36b to rvc-dev
Bug: b/167405184 Change-Id: Ide73513d5822670eeb16e6b4a4332d1dc77567de Merged-In: Ic8a8adb3fffb357754384ddbf13684d944a9767e
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Bug: b/167405184 Change-Id: Ide73513d5822670eeb16e6b4a4332d1dc77567de Merged-In: Ic8a8adb3fffb357754384ddbf13684d944a9767e