Merge "Add libvendorsupport to `deps` of `generic_system_image`" into main am:...

Merge "Add libvendorsupport to `deps` of `generic_system_image`" into main am: a54e8996 am: e5d15693

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



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