Merge "Add variant name to module info" am: a85a30c611 am: 0dbf7c740f am: b1b9cbc149 am: 10b9f13f96

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

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