[automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a5 -s ours am: fead96f4 -s ours

am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 f3cf55f7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: I1674bc25788b15f311a853e0c2ee65269fd89d74

[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3 -s ours am: e41bdecd -s ours

am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 0b4be020 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: Iba94adfb3713288c908000248571f188750618ec

[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3 am: 01dbd8fe -s ours

am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 8533f883 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: I8ba32a310ee65eacc7f325de15278b120f18c76a

[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34b am: 3ef103ff -s ours

am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 fac2a725 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: Ib95f75820ff5950fd30e07ce11c4d3605dcffb27

[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f am: aa2d5601 -s ours

am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 0aa413eb is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: I503dd64d09dc2b19682284d3d40e000d7189d955

am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 f3cf55f7 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14687246

Change-Id: I66773072e8ed02d6ce91c031bdfbdd8636dddce8

[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3 -s ours

am skip reason: Merged-In I2dbeddac6273e2392ccaeae51a1c7776d6d3da75 with SHA-1 8533f883 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: I12bf8a6e329e7d3555dd2387419e875f05017128

* changes:
  Improve IKEv2/IPsec VPN by proposing more IPsec algorithms
  Improve IKEv2/IPsec VPN by proposing more IKE algorithms

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: I8bc8d16e7a6cf0b5a032fc2ea42d6f93cd3d77f2

[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34b -s ours am: ff7a4802 -s ours

am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 bc667123 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: I4c1088a626cb0c8d0dd17ddbac6ff47ffee20b1c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14676745

Change-Id: I7ecafab76cf840be01207b6e504e9ce0a8b579a9

[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours am: aa081790 -s ours

am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 92346fdf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: If57b7100cea33ca4eadf67ab61be146125bd77a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: I77eba9e12795cc32f04073c3d18dc67dc1e3074b

Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: I71ea7c265e109f44286dd2aafeee2964f24f2ed2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: Icdab309144d7f4fa5ec1eb80efd919c66d408839

[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34b -s ours

am skip reason: Merged-In If2dd69f702a1eafff331f9e71f6b92aeadfb715d with SHA-1 bc667123 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674293

Change-Id: I3672d2fe9420368e76ce7e724b7d9c2b7ac26660

[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours

am skip reason: Merged-In I369e71dd6ae85da78e114ea8377967ab0bde787b with SHA-1 92346fdf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14674291

Change-Id: Ib7f2157f4b1cf82dd7d124ac263fd9c3a61f2c7c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1715476

Change-Id: I06e249398983790eeda9378b36f181ee459c10e1

This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.

This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))

Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c
Merged-In: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c

Merge "Improve IKEv2/IPsec VPN by proposing more IPsec algorithms" am: 5cb9e37a am: 10f4456e am: 80ddfb47

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: Id1dc3b15c495b5ab2a3578286bdb6ad57f647a29

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: I0e467627fdbf70d6ec704f1f2be58223df9642ed

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690265

Change-Id: I8b8a423b093f5a8696e43afbdac0cbb555dd4aff

This commit allows IKEv2/IPsec VPN to propose more algorithms that
newly added in IpSecAlgorithm. Those new algorithms have stronger
security guarantees and better performances.

This commit also removes algorithm name validation because all
algorithms are URL encoded to ensure no special characters create
problems due to their use by VpnProfile for list or field delimiting
(e.g. rfc7539esp(chacha20,poly1305))

Bug: 185265778
Test: atest FrameworksNetTests, CtsNetTestCases
Test: All new algorithms are manually verified
Change-Id: I1de322c95aacc8924e95bcdbcfdbd1ec441de99c

BUG: 186628461
Test: TH
Change-Id: Id03e0dfbe621b8ad08e594c0f6525ad9240837ae

This CL updates ConnectivityService to check location permissions for
ConnectivityDiagnostics callbacks last in the permission check process.
This minimizes misattribution of location access for networks that an
app is not administering.

This CL also updates ConnectivityDiagnosticsManager documentation to
clearly state that location permissions are required in order to receive
callbacks.

Bug: 187310575
Test: atest ConnectivityDiagnosticsManagerTest
Test: atest ConnectivityServiceTest
Change-Id: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
Merged-In: I2dbeddac6273e2392ccaeae51a1c7776d6d3da75
(cherry picked from commit f3d0fc49)

[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 54498935 am: 0def2a4e -s ours am: a2e59b47 -s ours

am skip reason: Merged-In Ic13f1d9832d5ae5b6ae4b96323025d9b695fdaf9 with SHA-1 a1a2ccb8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089

Change-Id: Idaaf679a334cac51c220f9b5222e41671d087416

[automerger skipped] Merge "Move to renamed NDK symbol AFileDescriptor_getFd" am: 54498935 am: 0def2a4e -s ours

am skip reason: Merged-In Ic13f1d9832d5ae5b6ae4b96323025d9b695fdaf9 with SHA-1 a1a2ccb8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089

Change-Id: I9a5838ea3a86a64214181135ff87d2fb52cfcddd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1703089

Change-Id: Ia45703aa469fcfb1efcc6b12479254e731dc794b

When apps try to call factoryReset to do networking reset, it
will result in updating the setting in SettingsProvider.
ContentProvider will verify if the package name of the caller
that initiated the request being processed on the current thread.
The package should belong to the calling UID. The setting update
started from the ConnectivityService context, so the package will
be android but the calling UID will be the calling app. It will
cause a SecurityException. The behavior is fine previously as its
known caller(Settings) shares system UID. But it will be a
problem for other callers, such as CTS. Thus, clear the identity
since the necessary permission check should be examined at the
top of the method. The following actions should be fine to be
proceed from the system itself. Also replace the user restriction
check via hasUserRestrictionForUser with the UserHandle created
from the calling uid to ensure it's verified with correct user.

Bug: 186061922
Test: Factory reset from Settings
Merged-In: If2dd69f702a1eafff331f9e71f6b92aeadfb715d
Change-Id: If2dd69f702a1eafff331f9e71f6b92aeadfb715d
(cherry picked from commit 10ba4b77)

Bug: 186061922
Test: atest CtsNetTestCases:android.net.NetworkCapabilitiesTest
Merged-In: I369e71dd6ae85da78e114ea8377967ab0bde787b
Change-Id: I369e71dd6ae85da78e114ea8377967ab0bde787b
(cherry picked from commit 0aa0790d)

Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d8 am: 38b86a2c am: ca34df0a

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731

Change-Id: Ib3005e70fd2f70a9ba591157c9ac9edd4642ddae

Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" am: 32bd81d8 am: 38b86a2c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731

Change-Id: I53a692383de98d959b029cfd618621f47059fdd5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1712731

Change-Id: I6a5f4681224315c2c63cad24e0defd1abcc25330

Merge "Use CS identity to update setting while performing factory reset" am: 049dbc56 am: ab42076b am: 6eeaa900

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1695309

Change-Id: I97ea36e551d4445475e8edce1a752d380fd03bee