am f9fdb08c: am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit 'f9fdb08caae30e789d573ab3260fc87e9d43041b':
  Introduced android.permission.PEERS_MAC_ADDRESS permission