Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/16214695 Bug: 206073065 Bug: 206448852 Test: Test: I solemnly swear I tested this conflict resolution. Merged-In: I80c9f887cf8b4714716d657da92ed273a532ce27 Merged-In: I2f5790b9217357ddcf3f466cec1b2b1afbb47210