Merge "Revert "Revert "Switch to use new Doclava""" am: a05f0437fe am: 3d693ce4b4

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2463154

Change-Id: I927dd96a627dd4779667369b63b883adcd29e655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>