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

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