Merge "Rename ACTION_UPDATE_DEVICE_MANAGEMENT_ROLE_HOLDER" into tm-dev