Merge "Revert "make isUiModeLocked, isNightModeLocked test api"" into nyc-dev