Merge "Set higher priority for ADD_DEVICE_ADMIN intent" into tm-dev