Merge "Convert MultiDexLegacy* tests to Android.bp and d8 --main-dex-rules" am: 58210e2960 am: 35f4acb9bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1829054

Change-Id: I4d7300c9da657a672d790bc270189e1c3354adbc