Merge "Remove --ignore-classes-on-classpath argument" am: c02168f5d1 am: 481ba3e20a am: 8bf15714d5

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

Change-Id: I15a0a33b96f8a57ba7146166c458e92d397862fb