Merge branch 'android11-5.4' into 'android11-5.4-lts'

Sync up with android11-5.4 for the following commits:

9c7cbdf8 ANDROID: ABI: add symbols of drm_atomic_helper_setup_commit to unisoc
70f2e815 ANDROID: ABI: update allowed list for galaxy
e7eb0751 UPSTREAM: HID: core: Correctly handle ReportSize being zero
bdf78f31 UPSTREAM: HID: core: Sanitize event code and type when mapping input
cd029936 FROMLIST: scripts: merge_config: add strict mode to fail upon any redefinition
559c23e6 ANDROID: vmlinux.lds.h: merge compound literal sections

Change-Id: I7247d8946353c3925f824b890116c5dffa4faf9d