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

Sync up with android11-5.4 for the following commits:

b0f930a5 BACKPORT: f2fs: relocate inline conversion from mmap() to mkwrite()
4f4602b7 BACKPORT: f2fs: support RO feature
e6fd4c5c BACKPORT: f2fs: fix wrong total_sections check and fsmeta check
ce664fbd BACKPORT: FROMGIT: binder: fix freeze race
b1232b02 FROMGIT: binder: BINDER_GET_FROZEN_INFO ioctl
a02d0f68 FROMGIT: binder: use EINTR for interrupted wait for work
e658e9e4 BACKPORT: FROMGIT: binder: BINDER_FREEZE ioctl
63ef4447 ANDROID: usb: gadget: f_accessory: Mitgate handling of non-existent USB request
50c9c8cb FROMGIT: binder: fix test regression due to sender_euid change
1c1f5718 BACKPORT: binder: use cred instead of task for getsecid
ea1a2391 BACKPORT: binder: use cred instead of task for selinux checks
1fe8a2bb BACKPORT: binder: use euid from cred instead of using task
a0800501 ANDROID: setlocalversion: make KMI_GENERATION optional
e785a25f Revert "ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC"

Change-Id: Ica7d80e62dcd4b12f7294bcc4b5c9291491ad37b
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>