Merge "Fix unbundled settings launching activity."

src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java

@@ -105,7 +105,7 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
             return super.handlePreferenceTreeClick(preference);
         }
         Intent intent = new Intent();
-        intent.setComponent(currentFragmentName);
+        intent.setComponent(replacingActivity);
         mContext.startActivity(intent);
         return true;
     }
@@ -189,4 +189,4 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle
         String pkgName = lastPkgIndex > 0 ? classPath.substring(0, lastPkgIndex) : "";
         return new ComponentName(pkgName, split[classNameIndex]);
     }
-}
+}