Merge "Add support for packaging modules.load.recovery into...

Merge "Add support for packaging modules.load.recovery into vendor_kernel_boot" am: 43cbca31 am: a16bae66

Original change: https://android-review.googlesource.com/c/platform/build/+/2403126



Change-Id: Ic55c92dcafa40ee66a02624a73843c971136d82d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>