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

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

Change-Id: I8c96008729ac94f3053ee1e6773951a146b9a11f