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

Change-Id: I43c0680cc44ff0c12b81e29c8fd9e4f74df3c531