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



Change-Id: I59b824d3602667787fb1a430e358f6bdbee445da
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/+/2975814



Change-Id: I6cead2d8d7a07100d2a11448ee10b3f613fadb83
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/+/2864689



Change-Id: I5f02475e3d140133540a25ff12194f792bdd08d8
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/+/2969871



Change-Id: Ib368e7ddbb6157536769af00ddd8426e02bf55a1
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/+/2979571



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

[automerger skipped] Merge "Pass Device bus ID from native to Java" into main am: a3bbef4a -s ours

am skip reason: Merged-In I0ff2e31d7a8b610b0e1208cc5c444d1f785e162c with SHA-1 b4015294 is already in history

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



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

am skip reason: Merged-In I0ff2e31d7a8b610b0e1208cc5c444d1f785e162c with SHA-1 b4015294 is already in history

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



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

am skip reason: Merged-In Id96d86242ab239c7df0efe74bf13fb97eb97f482 with SHA-1 03a1658c is already in history

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



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

am skip reason: Merged-In Id96d86242ab239c7df0efe74bf13fb97eb97f482 with SHA-1 03a1658c is already in history

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



Change-Id: Id4e48baffee8ea222a8c10f9fd7d140e1974e761
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/+/2977292



Change-Id: Iba1ecd034ca492ef0f55a43a66f346a46043c09f
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/+/2967634



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

Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main am: c99012b6

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



Change-Id: I26ad96fd2fac533dfcc9e284ca4d0de0b2f5bc75
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/+/2966947



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

[automerger skipped] Merge "Add jarjar_prefix to framework-minus-apex" into main am: 8095041d -s ours

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history

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



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

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history

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



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

[automerger skipped] Merge "Revert "Add jarjar_prefix to framework-minus-apex"" into main am: 9f5f7378 -s ours

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2962255

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



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

am skip reason: Merged-In Ie2ee7578352463aa42942c0b42b78557c414fb52 with SHA-1 f9bdb797 is already in history. Merged-In was found from reverted change.

Reverted change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2962255

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



Change-Id: Idd1bec60842ee958294eddfb27162312478decc8
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/+/2971614



Change-Id: I37c3b716f5e39531ac45ce4cd0d53983e99f45fe
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/+/2977631



Change-Id: I6c067ef3ea5e7b680e0dc64d6e209b3524c7fcf1
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/+/2941325



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

Merge "Merge "Add OWNERS files for media-related packages" into main am: 098ba9f3" into aosp-main-future

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



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

The `Notification.Style` class is an abstract class with a publicly
visible constructor and so the assumption is it is expected to be
extended by Apps. As such it cannot have any hidden abstract methods as
that would prevent an App from extending the class. Unfortunately,
`areNotificationsVisiblyDifferent(Style)` is both hidden and abstract.

The issue was not previously detected due to a bug in Metalava but that
has been fixed and so now this is an issue. This change is temporarily
suppressing the error in the code to unblock Metalava changes being
merged into AOSP but it should be fixed properly ASAP.

A proper fix would either require marking the public constructor as
`@removed` or unhiding the method or giving it a concrete
implementation.

Bug: 324468829
Test: m checkapi android-non-updatable-doc-stubs
(cherry picked from https://android-review.googlesource.com/q/commit:ddc69d098f03fce1bed20144f92b8743eddb1767)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:57f1c4e1e85a4593ec596af264cd644e2130a6cb)
Merged-In: I3b72ef4f0afff35771ee6f37130d1084071e2de1
Change-Id: I3b72ef4f0afff35771ee6f37130d1084071e2de1

Change-Id: Idafbb29affc1eb5b5ccbd4ce1eb33dc2b10c62fe
Test: N/a

Merge "Suppress HiddenAbstractMethod on Notification.Style.areNotificationsVisiblyDifferent" into main

A bug was introduced by recent changes to filter out redundant process
state changes.
NPMS was caching UidStateCallbackInfo objects per uid and not clearing
it or resetting the procStateSeq when the uid went away. This resulted
in state-changes not being processed after app restarts.

For example, if an app exited from TOP, it would lose network access due
to some rules, but the last UidStateCallbackInfo would stay at TOP. If
the same app restarted, the change would be filtered out as
uninteresting even though the network rules require an update.

Test: atest FrameworksServicesTests:NetworkPolicyManagerServiceTest

Bug: 326370901
Bug: 326675380
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:cafca44d84955504857e337fced3bef2912802bd)
Merged-In: I016435abcfd5300f33374e5d5c144b25f81728b4
Change-Id: I016435abcfd5300f33374e5d5c144b25f81728b4