Revert "Merge branch 'kk4.4' of github.com:EthanJ99/frameworks_base into kk4.4-caf"

This reverts commit 3e77e063b2290119923fe197c0217012ff5e2cb9, reversing
changes made to f7228e5144c0a046c33aa19f56da3ff3cbd4a981.