Merge "Fix null-pointer in EnableZenModeDialog" into rvc-dev am: 707032d7eb am: 99d57c0ad3 am: bc461464d3 am: beb43eb2bd
Change-Id: If475a0dd9ab45d5a29236fdbfdeaf3ae70a1e49d
This commit is contained in: