aml_tz4_332714070 (11568890,com.google.android.go.tzdata4,com.google.android.tzdata4)
Merge "Upgrade Doclava gradle version" am: 34876a477c am: 9bfcb851c9 am: b8a330e005 am: bbcaaacdad

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

Change-Id: I56e009badaedd9b8f09d233811e350357c5cb12c