Revert "use caf audio variant again"

This reverts commit a702b09aeb73eeedfb0ea38eae91a48dac807d43.
overlay: enable volume rocker wake in Settings

Change-Id: Id1910ff5fcd7d5ad2e2d60b1939747232de6dc3a