Merge android11-5.4.61+ (9c7cbdf8) into msm-5.4

* refs/heads/tmp-9c7cbdf8:
  ANDROID: ABI: add symbols of drm_atomic_helper_setup_commit to unisoc
  ANDROID: ABI: update allowed list for galaxy
  UPSTREAM: HID: core: Correctly handle ReportSize being zero
  UPSTREAM: HID: core: Sanitize event code and type when mapping input
  FROMLIST: scripts: merge_config: add strict mode to fail upon any redefinition

Change-Id: I9ae5aa15a3bcef589ca072743ed5713bf0d0cacb
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>