Merge android11-5.4.147+ (e785a25f) into msm-5.4

* refs/heads/tmp-e785a25f:
  Revert "ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC"
  ANDROID: GKI: rework the ANDROID_KABI_USE() macro to not use __UNIQUE()
  UPSTREAM: security: selinux: allow per-file labeling for bpffs
  ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC
  ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure
  ANDROID: f2fs: fix potential deadlock by android ftrace

Change-Id: I261a5fa5682452c021ad0ba4bb4da085ee340ab3
Signed-off-by: Srinivasarao Pathipati <quic_spathi@quicinc.com>