Merge "Blacklist Night display settings for testing" into oc-dr1-dev am: 4608c69f23
am: 02808bc7c9

Change-Id: Ibaa6aa302992f1336ebf25e31d9102874eda72fa