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

Change-Id: I6b164c8e1239d8d0c4210a86971216e50b99d2ec