[automerger skipped] Prevent concurrent modification exceptions in...

[automerger skipped] Prevent concurrent modification exceptions in VcnManagementService am: 5c5b4850 am: 03f7fd1f -s ours am: bcb12d36 -s ours

am skip reason: Merged-In Ibcc4bdc06301dd77260adaa0c086529f8f524679 with SHA-1 f8ce665d is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715568

Change-Id: I3d2be72d49f6d3d676bd0c644b20b41d9b12ad33