[automerger skipped] Merge changes from topic "sdk_int_cp" am: 800eff01d0 am: ab157b3c5b -s ours
am skip reason: Merged-In I1fbc0f714d539a664c053cb9cf1f86c3e651c5a2 with SHA-1 5798a37596 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1686027
Change-Id: I64982175a6aa08616ca885f3a9dfddcc6bc91110
This commit is contained in: