Merge "Remove mainDexClasses from the SDK" am: 8e7a1df497 am: 063e6e21df

Original change: https://android-review.googlesource.com/c/platform/development/+/1828912

Change-Id: I260bbe6591c18fccbb88029b6fb7aece880cfb3b