[Cherry-pick] Use the correct handleMmi function am: a1e500b29a am: 05a8c8a318 am: f2d4bc9098 am: fc17ba8a41
am: c34b67a196

Change-Id: I57d43b5b39e977718c07f07da4c3df8b9e13ce38