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

Change-Id: I9af926344d9703b5754be9ef893527abf6d1a2c7