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