[automerger skipped] Merge fixed history of Connectivity am: 1af06c78df -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/+/14731885
Change-Id: I3b3ead62f219768d475849c5721530cfc53d5966
This commit is contained in: