Merge android11-5.4.61+ (364ec3d2) into msm-5.4

* refs/heads/tmp-364ec3d2:
  UPSTREAM: futex: Don't enable IRQs unconditionally in put_pi_state()
  UPSTREAM: futex: Handle transient "ownerless" rtmutex state correctly
  UPSTREAM: futex: Fix incorrect should_fail_futex() handling
  ANDROID: add macros to create OEM data fields
  BACKPORT: arm64: perf: Support new DT compatibles
  UPSTREAM: usb: xhci-mtk: fix unreleased bandwidth data
  ANDROID: sched: add em_pd_energy vendor hook
  ANDROID: schedutil: add vendor hook for adjusting util to freq calculation
  ANDROID: ABI: update symbols of unisoc whitelist
  Revert "BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once"
  BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
  ANDROID: simplify vendor hooks for non-GKI builds

 Conflicts:
	kernel/sched/cpufreq_schedutil.c

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