Merge "Stop ignoring classes on the classpath for stubs" am: 61e082abdb am: ab3f2d3aba am: 81bfcb40a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I814572df3ea32202a9f348901143d0b244dad56f