Call to equals() comparing different types

I have found this bug with the FindBugs tool

Change-Id: I7f157063b0a549cb4344c048ddb612a14a915a25
Signed-off-by: László Dávid <laszlo.david@gmail.com>
Merge "Call to equals() comparing different types"
Merge branch 'master' of https://android.googlesource.com/platform/packages/apps/Settings