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