[automerger skipped] Merge "Add the system_dlkm partition to goldfish" into...

[automerger skipped] Merge "Add the system_dlkm partition to goldfish" into tm-qpr-dev am: 62c76ddc -s ours am: 81383bb2 -s ours

am skip reason: Merged-In I0ff1528cf4c79c9604db6302d9a3470e81aae7ee with SHA-1 8e7f862b is already in history

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



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