Merge "Make MODIFY_DAY_NIGHT_MODE and OBSERVE_APP_USAGE permissions grantable via role." into udc-qpr-dev