* keystone/mirror-android12-5.10:
ANDROID: GKI: Fix file mode on mtk abi file
UPSTREAM: erofs: fix deadlock when shrink erofs slab
ANDROID: init_task: Init android vendor and oem data
Signed-off-by: Daniel Norman <danielnorman@google.com>
Change-Id: I6dd077bbaccc784efb63caa8ec4cf005ea696b77