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

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