Android 7.1.0 release 5
[Cherry-pick] Use the correct handleMmi function
am: a1e500b29a

Change-Id: I1d14ccd54f1cdacc13eeccc775101740776d4622