[automerger skipped] Prevent concurrent modification exceptions in VcnManagementService am: 5c5b4850 am: 03f7fd1f -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: Ic0563d9c21994ef5d1993a109419e4ebcc00df71