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

* commit '3c01ac0b199d787f6a81b01ab3b6296421ea40a0':
  Introduced android.permission.PEERS_MAC_ADDRESS permission