Merge "IntDef for DisplayMetrics.DENSITY_*" into main