Merge "releasetools: system_dlkm: add image to dist zip" am: ef8f4426ef

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

Change-Id: I5e13518b347c96c0bfc5edad6bc5488978bd5191