This reverts commit ab5006c1.

Reason for revert: b/316010034 breaking VCN unit tests

Change-Id: I68cb1a99bb6e492c16901972d201761cd00df6fa

Bug: 308011229
Test: IpSecServiceParameterizedTest (new tests)
Change-Id: I3f1c2ef60ee9b6ac17909e0ee083ee6f8483588e

* changes:
  [nearby] Returns error code for startBroadcast if there is an existing broadcast
  [nearby] Update README
  [nearby] Unregister broadcast listener in death
  [nearby] Add CredentialElement class
  [nearby][framework] Sync DataElement value with spec
  Fix NearbyConfigurationTest.
  Catches illegal argument exception thrown by LE advertiser

Bug: 308011229
Test: IpSecXfrmControllerTest
Change-Id: Id765cd8d8d7e330969877cb0890bd828417fb6b8

Fix: 294461081
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7b40aa36e8419e134c8171e22a7fa2a2d3bf85a7)
Merged-In: Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7
Change-Id: Icc3227ec5aa7d0ea7d33b7100ef131928577b5a7

Test: n/a
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:99c18f649c9a2623c905f9cbfea04a2559756050)
Merged-In: I0802e60f60170b3be686fa7b16aeb6a2571a7386
Change-Id: I0802e60f60170b3be686fa7b16aeb6a2571a7386

Fix: 280377682
Test: unit test
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:691adc8cdd1cca9077740ce06246ce347867d757)
Merged-In: I1d632cb150ae30808cbf3343869534111e3dde12
Change-Id: I1d632cb150ae30808cbf3343869534111e3dde12

This class should extend DataElement ideally, but we cannot do this
since the DataElement class as System API is final.

Bug: 290294482
Test: unit test
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e9e44c4f06c6ea58e991b695cb34dbc0c9d3b59)
Merged-In: I2ec80b5975a8fb27edb5f92f134d6076738eaac8
Change-Id: I2ec80b5975a8fb27edb5f92f134d6076738eaac8

Note DataType in DataElement is used for internal implementation only.
We only keep those data element types used for encoding and decoding.
Please use the spec as the only source.

go/nearby-specs-working-doc

Bug: 234155151
Test: -m
Ignore-AOSP-First: nearby_not_in_aosp_yet
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8182ac22c14e044c5161483a9a96bf594c403e61)
Merged-In: I71754e645742ca4fe20d346763796a1a5e5dae75
Change-Id: I71754e645742ca4fe20d346763796a1a5e5dae75

TestAppSupported Flag can be set to true only in user-debug devices.
Add conidtional testing for this test case.

Bug: 285234065
Ignore-AOSP-First: nearby_not_in_aosp_yet
Test: atest NearbyConfigurationTest
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:22b1e80835ec5bbacc7cb3bf88e072cfd8fcd8d9)
Merged-In: I14a7947f8a9178a1f97b5ed392882ab9f200eb89
Change-Id: I14a7947f8a9178a1f97b5ed392882ab9f200eb89

Test: on device test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Bug: 280387586
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1c6f7f6de1826c004ddc4ca69eb77d7416b0660)
Merged-In: Ie05ed9ff57743f0e91ec0571d5a99bebd55a56c8
Change-Id: Ie05ed9ff57743f0e91ec0571d5a99bebd55a56c8

Test: on device test
Ignore-AOSP-First: nearby_not_in_aosp_yet
Bug: 287538344
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7ed8dd6ac3479e19dd8c935bb356a2ecf2d7623f)
Merged-In: Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2
Change-Id: Idbf2918bae00b31ebb31f3f09590e32b4eb0ebc2

Merged-In: I08c79f7266116cfe8d6b0ed42a6f026547660cbc
Bug: 315507370
Change-Id: Id924654831ef1b5024d4329477d497783165426b

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



Change-Id: I08c79f7266116cfe8d6b0ed42a6f026547660cbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: Ib49434f5b3d0a47ac29a33fdf09150d912815018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: Ia1d888c88c48e50fcfab624fd28f75e847524a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Calling resets at the beginning of setUp is unnecessary.

Bug: 315368147
Test: TH

Change-Id: I87030bc867d90752e745fd4a274581d1f3230f85

Test: TH
Change-Id: Ic53e903f7a971c92793e3360a5d3f53c97c0503b

BYPASS_INCLUSIVE_LANGUAGE_REASON=Using public API
Test: atest ConnectivityCoverageTests:android.net.connectivity.com.android.server.CSBpfNetMapsTest
      (on U and V devices respectively)
Bug: 297836825
Fix: 314858283

Change-Id: Ibeac8cd3a33468c6539234255328affc6b3f8ffe

Merge "[CTS] Mark testGetRedactedNetworkCapabilitiesForPackage ConnectivityModuleTest" into main am: bccd95fa

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



Change-Id: I8fe3c0267864b09f0cabc337886cd304be477775
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: Ic4b73222c3f1ffcbe51b80a847846e3b3e89f4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Only reference DataSaverEnabled map on V+ platform because the
information in map before platform V is not time-precise. See comment in
this commit for detail.

Bug: 288340533
Test: presubmit
Change-Id: I0795e88e6006e6d24d27b63c31d0e3ed81d0262c

flags.aconfig for android networking is under
packages/modules/Connectivity.
But, currently, mainline code should not read trunk stable flag.
To avoid confusion, this CL moves flags.aconfig to platform.

Bug: 315302281
Test: TH
Change-Id: I3a667cfa14d51e481bb4e99301c10319d2600e00
Merged-In: I44c111577643bacb35b532cb156a61d30cfea31a

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



Change-Id: I979388a1b9c3ef13a891b2e29690bbb18a1b3fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: Ie8f1689029815e5d18d199d729c807d7d0f2fa2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 308011229
Test: make
Change-Id: Ib148b62b375f4f7b6a5d5ca82c74808bffa2e531

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



Change-Id: Ie0e57f2641fa4dd95be8e4f9b62233c97fc216bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: Ia983305248f41ebefb040eba341ef6ff7eca7af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This is a test only change, replacing the MdnsPointerRecord
constructor usage for queries with the new version.

Bug: 312657709
Test: atest FrameworksNetTests
Change-Id: Ie9e51df78bfc27090503b861c5ac979201f10608