Merge "Protect the android.intent.action.CALL_PRIVILEGED broadcast" into nyc-dev