Merge "Remove multidex version genrules" into main am: c9affafb am: 6311d7b4

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



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