Settings: Integrate WitAquaMagic into Settings

Change-Id: Id86228181a2ae84008a177d42d1fc94317eb2dc8
Signed-off-by: Joe Maples <joe@frap129.org>
Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>
12 files changed