Move Settings to aosp-s4 manifest