[automerger skipped] Merge fixed history of Connectivity am: 04a96452cf -s ours am: d1b1cd0961 -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: Ifdd570e70052ec82c211fab2f5ae9a959a187f2b
This commit is contained in: