[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours

am skip reason: Merged-In Ie3a058b904cb2e3704c3a0725c8f720f81bb235e with SHA-1 f9e7c2a543 is already in history

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

Change-Id: I82710ff2ce1c9176cb9dbacc7df5836199cce9b3