Merge "Change DEVICE_POLICY_RESOURCE_UPDATED broadcast extras" into tm-dev