[automerger skipped] Merge changes I81bf8969,I2edba513,Ibb913979 am: c06260b5b5 am: b1ef107d82 -s ours

am skip reason: Merged-In I81bf8969ace3cb6826b30c5bbd0b896c64c73c57 with SHA-1 ee93b3d3b3 is already in history

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

Change-Id: I7d8c1861abf4e112d96a81c887cbf1afda20b337