ANDROID: fix up 6.1.60 merge of hid.h into android14-6.1-lts

In commit 59aa3969 ("HID: input: map battery system charging"), the
battery_charge_status field was added, but that had already come into
the branch due to an earlier backport of the same commit, 28ee91ed
("UPSTREAM: HID: input: map battery system charging"), and then moved to
a different location in the structure in 8a67c060 ("ANDROID: GKI:
fix ABI breakage in struct hid_device").

Because of that, we had two copies of the same variable in the same
structure as git didn't know to remove it, so remove it by hand to fix
up the merge and build.

Fixes: 59aa3969 ("HID: input: map battery system charging")
Fixes: 8a67c060 ("ANDROID: GKI: fix ABI breakage in struct hid_device")
Fixes: 28ee91ed ("UPSTREAM: HID: input: map battery system charging")
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I89d50f885fd064033fd30609f83193298be45b02