Merge "Add NETWORK_SCAN permission"