Merge "Fix a concurrent modification exception when generating stubs" into udc-dev am: d92e8a78b5

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

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