Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev