Merge "Use the new 'partition' field in 'ApexInfo' to identify vendor apexes" into main am: c759f23f2f am: d65d54a577

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3351258

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