Merge "Revert "Revert "Use imported classes when searching for a class ..."" am: 0e515165dd am: 5297703a5b am: 5d5c3f640f

Original change: https://android-review.googlesource.com/c/platform/external/doclava/+/2619435

Change-Id: Iab4d44fb021a413d867181f69ba987cbdc525864
Signed-off-by: Automerger Merge Worker <[email protected]>