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

Change-Id: I647f60f33aecf0e42316d67adbedd92572b64c05