Merge "Fix memory leak in TopLevelBatteryPreferenceController" am: 060bf953e3 am: f5876a1df9 am: 9cfd6a6164 am: bd71ddc59b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1606501

Change-Id: If1d8252f6641658af7be154ebdbe118db2a9e92a