Merge "Upgrade Doclava gradle version" am: 34876a477c am: 9bfcb851c9

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

Change-Id: Ic9861c8c87d7961a19da5934ecaab1ca7d0b3cf5