FindBugs: Call to equals() comparing different types

Change-Id: If4185f9eec0adfa47a6741eb21111b6cdafac008
Merge branch 'kitkat-remix' of github.com:AOSPAL/android_packages_apps_Settings into kitkat-remix