Merge "Update Night display icon in Settings" into oc-dr1-dev
am: ddd692cf1a

Change-Id: I1af8434bc68283f5579cdf01901022d292ba2a13