Revert "Merge remote-tracking branch 'cm/cm-11.0' into vaosp"

This reverts commit c41f9a18d645b2c4f89412b1f09038f97870f479.