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

Change-Id: Icde937ce8b5134913cb6962e21785c31b605a155