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: Id0ae6354556e19fa02541abf337a1b7e3c56d989
Signed-off-by: Automerger Merge Worker <[email protected]>