Merge "Add assist gesture silence and wake settings" into oc-dr1-dev
am: 6eacc1a4ba

Change-Id: I16bac560e1ef3c20830f4bc79dca772da20032e7