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

Change-Id: I58373972ec0d3170c38b7dc60a4e9ab544be2641