Temporarily switch to fork of android_packages_apps_Settings

Change-Id: I12390d29819b2e4da77912e780f8e96aaa50c551