Merge "CDD: Allow display density to change, but require a fixed value for DENSITY_DEVICE_STABLE." into nougat-dev