Merge "CDD: Allow display density to change, but require a fixed value for DENSITY_DEVICE_STABLE." into nougat-dev am: cdd069781b am: 93c0c1d0b9 am: d30eb71969 am: 182c86515a
am: ce50b8e447

Change-Id: I22c6ba3121ac673bb89f188b155a3a7b5b6d8738