Merge "Add test coverage for com.android.permissioncontroller.permission.util.Utils#getColorResId" into udc-dev