Change-Id: Ib1cce12ce07d965c1c9f71d76d8caf8b47ff18db

This is a DroidMonitor revert that may or may not be needed, pending
further testing.

This reverts commit 54f94065.

Reason for revert: b/309054453
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d17d24a541b847567cabd3ba0dc52aaa3d621010)
Merged-In: I09287d014ea7ba5f20046ca3369fe0ba83b1f061
Change-Id: I09287d014ea7ba5f20046ca3369fe0ba83b1f061

Change-Id: I99d96d25da4aa3403f941f44f769479b3708a841

[automerger skipped] Merge "Do not allow setting notification access across users." into udc-qpr-dev am: 3d413229 -s ours am: baa88c32 -s ours

am skip reason: Merged-In I6c478ebcc1d981faf2d125a4b41909c3b6a30a2a with SHA-1 12bb4ed9 is already in history

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



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

[automerger skipped] Do not allow setting notification access across users. am: 0d030db8 -s ours am: 9db4d5e2 -s ours

am skip reason: Merged-In I6c478ebcc1d981faf2d125a4b41909c3b6a30a2a with SHA-1 12bb4ed9 is already in history

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



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

[automerger skipped] Merge "Do not allow setting notification access across users." into udc-qpr-dev am: 3d413229 -s ours

am skip reason: Merged-In I6c478ebcc1d981faf2d125a4b41909c3b6a30a2a with SHA-1 12bb4ed9 is already in history

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



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

am skip reason: Merged-In I6c478ebcc1d981faf2d125a4b41909c3b6a30a2a with SHA-1 12bb4ed9 is already in history

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



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

Change-Id: I1be7a70a7d3d31ad2584ebde0091056774158e6e

Merge "AIDL IRadioModemIndication#onImeiMappingChanged() implementation for the change in the IMEI wrt sim slot" into main

[automerger skipped] Merge "Update Spatialization and HeadTracking AIDL usage" into udc-qpr-dev-plus-aosp am: 7979c435 -s ours

am skip reason: Merged-In Id5b2ffba2131aebf0ec6656511f2f10f79db7567 with SHA-1 a74b6d65 is already in history

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



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

am skip reason: Merged-In Id5b2ffba2131aebf0ec6656511f2f10f79db7567 with SHA-1 a74b6d65 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours am: 44930c12 -s ours am: c49d99a0 -s ours am: 1cf6c44e -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: c5389467 -s ours am: 9bbc7a82 -s ours am: 615908c5 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours am: 9417c4c6 -s ours am: 9fe8a763 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: 6ed25e10 -s ours am: 294740bc -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours am: 44930c12 -s ours am: c49d99a0 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: c5389467 -s ours am: 9bbc7a82 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

Change-Id: I615874d9628c12d841c8e2310f0fd94158abbb0e

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours am: 63baa239 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: ae9c0dce -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours am: 9417c4c6 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: 6ed25e10 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours am: 44930c12 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours am: c5389467 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours am: 87de3983 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours am: cf447f63 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours am: cf1cde0e -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

The value -1 is passed in as UID by non-PendingIntent call flows to indicate
that there is no actual process in the role of the real caller. This
just improves readability to replace those -1 values that are compared
to the passed in UID (and where we pass in a -1 UID to other methods).

Test: atest com.android.server.wm.ActivityStarterTests android.server.wm.BackgroundActivityLaunchTest
Bug: 306059525
Change-Id: Iafa0b45bb9b382115a581f5a90419177e352767a

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: e20c9a5b -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours am: 6d2665c1 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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

[automerger skipped] Merge "Fix vulnerability that allowed attackers to start arbitary activities" into rvc-dev am: 6b55e128 am: eebdc4c3 am: 66864c7a am: 43bc68b8 am: 9a24157c -s ours am: a54dfa09 -s ours

am skip reason: Merged-In I146415ad400827d0a798e27f34f098feb5e96422 with SHA-1 bf8ff047 is already in history

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



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