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

Do a backmerge of android11-5.4 to catch some recent changes in that
branch.  Included in here are the following changes:

* ca48ea8b Merge tag 'android11-5.4.284_r00' into android11-5.4
* 425419e5 UPSTREAM: unicode: Don't special case ignorable code points
* 17135587 ANDROID: 16K: Fixup padding vm_flags bits on VMA splits
* f6da812a ANDROID: 16K: Introduce pgsize_migration_inline.h

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