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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I735487ab19a1396dae84592a065a9b507395cc0d