[automerger skipped] Allow the vendor partition to be in /system/vendor. am: 7d360b3bc2 -s ours

am skip reason: Merged-In I9267c008db644ebe38f6215d3b692b98dd88ee34 with SHA-1 7eacdf8e53 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/19946224

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