Merge "[Nfc framework] API to include/exclude Other category service component" into main am: 8c7eea40

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



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

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



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

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



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

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



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

Bug: 304478767
Test: Compiles
Merged-In: If0b1432b78ec42a02446754ff6cf454fbb875048
Change-Id: If0b1432b78ec42a02446754ff6cf454fbb875048

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



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

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



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

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



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

Bug: http://b/307806447
Test: TreeHugger
Change-Id: Ib07514426643d8682c768b87e32fff2abddcda13

Merge "Revert "Revert "[BR07.2] Redirect data saver switch to Connectiv..."" into main am: c056440a

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



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

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



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

Bug: 276358140
Test: make update-api
API-Coverage-Bug: 308000143
Change-Id: Icf5df742a30ccdc5b53a2e3cc78f0efd38b2739a

Update VcnGatewayConnection to support disabling safe mode

Bug: 276358140
Test: atest FrameworksVcnTests (new tests)
Test: atest CtsVcnTestCases
Change-Id: If767dbace925c7e13705db2ea6f23c890992405c

Bug: 307352220
Test: atest CtsNfcTestCases
Change-Id: I5b42578dcb4d0bf022fde8623f4f82cb0ac0c74b

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



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

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



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

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



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

Bug: 305065851
Test: treehugger
Change-Id: I768ab21f9a76d4d89cfc03e36a417ed5d7482b49

Bug: 307903002
Change-Id: I0391a2c1d20eac11e1c71bc38d43a1eac1eaec92
Test: N/A

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



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

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



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

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



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

When forking zygote processes, 'forkSimpleApps' may process multiple
simple apps in the command buffer at once. However, the parsed zygote
arguments are computed based on the first app in the command buffer,
which can lead to all launched processes being assigned the same name.

Move the setting of the child process name into childMain and use the
arguments from it's local ZygoteArguments for the appropriate name.

Bug: 305970538
Test: Verified aosp_cf_riscv64_phone correctly uses unique process names
and PIDs match intended name.
Change-Id: I0febc49649b0ede4c07898b47b0ebe6ac37e7057

Change-Id: I64b2644ffb8ee75043623222b48fba8f2cfc5f08

Bug: 276358140
Test: atest FrameworksVcnTests (new tests)
Test: atest CtsVcnTestCases
Change-Id: I7b460cc3a3b143de212bb5a1b717fc99582f05ec

Fix a bug that the user can still enter pin/pattern
during lockout timeout when doing special user
credential verification.

Bug: 301924294
Test: b/301924294#comment1

Change-Id: I3301a811a5038adc3014fb149274da86b8bd900d