Merge "Disable NightDisplaySettingsActivity when not available" into nyc-mr1-dev
am: d8a275a1d2
Change-Id: Id01768d67598b6f7ff93450b6df6e07d4f38ee06
This commit is contained in:
am: d8a275a1d2
Change-Id: Id01768d67598b6f7ff93450b6df6e07d4f38ee06