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"
am: 57cb0a3a3b

Change-Id: I97d4fd19a2dc94a96107e734fb0991156f9be78f