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
am: 0ba96aae13

Change-Id: Iedf8dabe0e66d1014f4ce16b11fe6a8045d92cfc