[automerger skipped] Merge history of packages/Connectivity am: 2afd0986 am: 087dd90e -s ours am: 51ad4a48 -s ours

am skip reason: Merged-In Ie82d0fb34bda77543e31c82660c6f315efa87f62 with SHA-1 cd4d44cb is already in history

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

Change-Id: Ic43590a9e98b51a9370ccb8690b2908003676acb

am skip reason: skipped by user reminv

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

Change-Id: I6f4023633a4561f1bf68e34c2c751d2fe1d41733

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

BUG: 186628461
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: Ia7945b929573c9a5e697fb69358cd6d3c8beab00

Modified Visibility / Includes for:
- Tethering/common/TetheringLib/Android.bp

Modified License Import for:
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I3c2563d4ae4e3715d0c6270344ba8f7ef067872f

[automerger skipped] Merge "Merge history of packages/Connectivity" into sc-v2-dev-plus-aosp am: 4b6d3cab -s ours

am skip reason: Merged-In Ie82d0fb34bda77543e31c82660c6f315efa87f62 with SHA-1 cd4d44cb is already in history

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

Change-Id: Iaff5f42afeb946585b08f4c9aae60278b2519119

Merge "Disable tryCell when UpstreamMonitor stop" am: 011552cc am: bed1ae7b am: 1217274a am: 276edc75

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

Change-Id: I5450ed037d8e0ad0e7c8e227530533a31bc46bb3

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

Change-Id: Ia7ba42a7c5c5155c87f6872814391608227dc830

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

Change-Id: I4f55ae5885e3904d0d2d17384875cb00809a0eed

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

Change-Id: If734189ea422c37e524dc1fc6ad107307c7b0ad3

Modified License Import for:
- Tethering/common/TetheringLib/Android.bp
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp

Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Change-Id: Ie82d0fb34bda77543e31c82660c6f315efa87f62

Modified License Import for:
- Tethering/common/TetheringLib/Android.bp
- framework/Android.bp
- service/Android.bp
- tests/common/Android.bp
- tests/deflake/Android.bp
- tests/integration/Android.bp
- tests/smoketest/Android.bp
- tests/unit/Android.bp
- tests/unit/jni/Android.bp
Modified Lint mapping for:
- framework/lint-baseline.xml
- service/lint-baseline.xml

BUG: 186628461
TEST: TH
Merged-In: Ie82d0fb34bda77543e31c82660c6f315efa87f62
Change-Id: I7b5fd61cd551c7010f5b8ceabbfdd04f30f648dd

[automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a5 am: 69292a88 -s ours am: 90a26352 -s ours

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

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

Change-Id: I045454dc636129c889e8f97fe1a89b297d806e5a

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

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

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

Change-Id: Iadbeb14337aacf8edb419ffb03f66b636c489b04

[automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 958fe9a5 -s ours am: fead96f4 -s ours am: c0c36c1f -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: Ie85263c9cf586dca4ad112626a0671a7ac612c21

[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3 -s ours am: e41bdecd -s ours am: fc6a513c -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: I61f9ff4be469c8675fa34604c98f8c580268a396

[automerger skipped] Merge "Check location permission for ConnDiags last." into sc-dev am: 424e2ef3 am: 01dbd8fe -s ours am: 863a8080 -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: Id3a8dcf51911f52020129492cb7300237b2890ec

[automerger skipped] Merge "Use CS identity to update setting while performing factory reset" into sc-dev am: 08bbc34b am: 3ef103ff -s ours am: 8dc19701 -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: Ia4d8ed31a0ad201026d6a85a591fce49b9716a25

[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f am: aa2d5601 -s ours am: 079b6135 -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: I528ab0e2d12de7bfcfd8cf913bc2b54240187198

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

Change-Id: Id46109aba233c39838905752e04fecf556acf267

[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: 46fa3c96 -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: I305ac78682f971acfa5d83ccf64bda6832d33715

[automerger skipped] Merge "Add test for NetworkCapabilities.Builder.withoutDefaultCapabilities" into sc-dev am: 7094b6470f -s ours am: aa081790 -s ours am: a3c9576a -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: Iafba11d1abfa76355e4c374c47eeee7d730c2995

[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

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

Change-Id: If93dfeab89c644f67001c144253a594996c96eef

[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