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

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