[automerger skipped] Merge "MultiDexLegacy minsdk bump from 8 to 21...

[automerger skipped] Merge "MultiDexLegacy minsdk bump from 8 to 21 MultiDexLegacy minsdk bump from 9 to 21" into main am: 4cceeb65 -s ours

am skip reason: Merged-In I3525c27e0f0121e66c4f579aef5cba1999ffdacd with SHA-1 7aad8778 is already in history

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



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