Merge "Check initial state of ZenMode to be one of the valid values" into oreo-cts-dev
am: e784b62f74

Change-Id: I6f3c6bda518076145e34a06b5661c3477f09e60b