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

* commit 'ce3b66f542947211ed8ea7e09267bb66ff687a34':
  Rename uses-permission-m to uses-permission-23