Fix typo in AndroidManifest.xml

Change-Id: I58e22d026a47cf2ff83e9728a666fc1a0fb525f4
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0