Merge "Upgrade Doclava gradle version" am: 34876a477c

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

Change-Id: Icead8cc4c36700e9469c452d23890212998e9b6e