am 67a461ec: Merge "Rename uses-permission-m to uses-permission-23" into mnc-dev

* commit '67a461eca888243e1f4960e662aa2059c90da629':
  Rename uses-permission-m to uses-permission-23