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



Change-Id: I4f2c87b5e73203d8df45657dd5821bc19083b17e
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/+/2514015



Change-Id: Ic383508234e16c5c3f0e05d87b3918c53b6e012e
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/+/2485756



Change-Id: I801f963f099af5c780bc927b0292355a9020f874
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/+/2510575



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

Fix "keep in sync" comments for definitions that should match
those in system/media/audio/include/system/audio-hal-enums.h

Test: none, comment update
Change-Id: I150d1262b1cb1d204eb1ff55a7f05f5f65f81680

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



Change-Id: I623e60cfd448da55c925ccd660bbb626a406d45d
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/+/2502315



Change-Id: I2edf78c65c13e13bde7dc4bf8e897def70c18055
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/+/2510797



Change-Id: Id551d23713d6797d514c419e888aa7ff2d500bc2
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/+/2510797



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

Change-Id: I24b8fad3c1bfe735a32678ff842bc2132d16af12

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



Change-Id: Ib6cbcb49d14a93d91b6b8944393eb08eacf6835e
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/+/2504875



Change-Id: I9010d6fe29e7b189bacf079c96ad299d4488fb1a
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/+/2510075



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

Revert submission 2370228-legacy_iwlan_removal

Reason for revert: try finding the culprit for b/275330844

Reverted changes: /q/submissionid:2370228-legacy_iwlan_removal

Change-Id: Ibd5482d73e50cdaab583a05542b9b3d471424a15

If a client adds custom crafted strings as part of matching key,
it is possible for this restriction to go unnoticed. Instead,
just all allow characters in the key. This means that we cannot
solely rely on getDeliveryGroupMatchingKey() for matching but
don't think this would be a problem for clients of this API
outside the System.

Bug: 275312433
Test: TH
Change-Id: I2ad9c6d270678ddb881168936b1f74bd375de58c
Merged-In: I76e307800017d4dd1e66233b1ff4cc5cbcef7246

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



Change-Id: I1756f408ade6674b031920a60a9def1f336099c3
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/+/2465252



Change-Id: I03323d388f669c25196dc1a38dd9e653b806e0f1
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/+/2509716



Change-Id: I7655fbad9ce68a7abb1122cd4874167c39e3ed7b
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/+/2509995



Change-Id: I6cfd1cc04d680e22fa65994df4165f36392e30e1
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/+/2491878



Change-Id: I651c7b03c2a9da581cb14a7fb36c1775e2473085
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/+/2508115



Change-Id: I82c6271923b83d2038d0a78825f5622184ed0658
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/+/2510199



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

- Move SoundTrigger owners to reference authoritative file
- Add SoundTrigger ownership to top level services/voiceinteraction directory
to simplify maintenance.

Test: Compiles
Fixes: 275435310
Change-Id: I3fc8e98ef017f93f7208dc2fb5073beda6dcfb18