Merge "Retry and ignore ConcurrentModificationException" am: 93bda73970 am: 8a47dfb768

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1772444

Change-Id: I1e449a74117b45fe752decdc02ad3966ded36ef2