This helps fix issues with improper layouts of
adapter child views in case
RemoteCollecionItemsAdapter is used.

Test: Manual
Bug: 245950570
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dc464d6e522eebec5221a934ec3ff5f52a4fb90e)
Merged-In: I0eedf4574975bfae88801e0153816135fc1c8181
Change-Id: I0eedf4574975bfae88801e0153816135fc1c8181

Merge "Merge "Merge "Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777bec" into android12L-tests-dev am: ee000fe9" into android13-tests-dev am: 02a358d2" into android14-tests-dev

Merge "Merge "Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777bec" into android12L-tests-dev am: ee000fe9" into android13-tests-dev am: 02a358d2

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



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

Merge "Merge "Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777bec" into android12L-tests-dev am: ee000fe9" into android13-tests-dev

Merge "Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777bec" into android12L-tests-dev am: ee000fe9

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



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

Merge "Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777bec" into android12L-tests-dev

Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev am: 9f777bec

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



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

Merge "Update OWNERS (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222) Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392 Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392" into android12-tests-dev

(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:68d82ec47cd4b6414e3c8aab0a81e319e657f222)
Merged-In: Iabec62cb23301d00a2e7d4808a801b443f0fb392
Change-Id: Iabec62cb23301d00a2e7d4808a801b443f0fb392

Previously we restricted the frame rate override of game intervention to
a certain set of values, which is now not scalable and not compatible to
all devices.

In addition, SurfaceFlinger is able to choose the proper
frame rate to run at, there is no longer a need to impose such
restriction to available frame rates.

Bug: 296988493
Bug: 253178812

Tested on Pixel 7 Pro userdebug
Test: atest GameManagerServiceTests
Test: atest GameManagerTests
Test: atest CtsFrameRateOverrideTestCases

Change-Id: I2e2e18a9ec0d1a2fd505464a1297e9b7f9874d1c
Merged-In: I2e2e18a9ec0d1a2fd505464a1297e9b7f9874d1c
(cherry picked from commit b3e07d83)

This fixes some test issues when physical and logical display sizes differ.

Bug: 294251187
Bug: 296424695
Test: SurfaceControlViewHostTests after running `adb shell wm size 800x1920`
Change-Id: Id9553b7d965ecaa6adf9c5c7acffe2f57576c716
Merged-In: Id9553b7d965ecaa6adf9c5c7acffe2f57576c716
(cherry picked from commit f103479f)

This change prevents all callbacks from MediaSession after
the app calls MediaSession#release. Concretely, this change
fixes flakiness in MediaControllerTest, where the callback
implementation tries to access the media session after its
corresponding field has been set to null.

Bug: 294178159
Bug: 283873741
Test: atest CtsMediaBetterTogetherTestCases
Change-Id: I112fa5df6aafdb2774ed65c2d08ab1eb680e6b47
(cherry picked from commit 9452bb9f)
Merged-In: I112fa5df6aafdb2774ed65c2d08ab1eb680e6b47

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours am: d5010768 -s ours am: 502f3f90 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 192e1926 -s ours am: 4314ab38 -s ours am: 9fe459d1 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours am: d5010768 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 192e1926 -s ours am: 4314ab38 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours am: e870f7c2 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 192e1926 -s ours am: bbfea0e2 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours

am skip reason: subject contains skip directive

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



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

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3a075dee -s ours

am skip reason: subject contains skip directive

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



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

am skip reason: subject contains skip directive

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



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

Fixed the issue caused by intent creation without system context and the
npe caused by null action chip list. Dropping then restoring caller id
before intent creation and passing an empty list to avoid npe.
Using uuid to distinguish different cred options in session.

Bug: 287538489
Bug: 287529343
Bug: 287689739
Test: local
Change-Id: I5612dd0f08a90a762c5ca5794a55a7abccecad2f

MediaControlPanel instances were being leak through the ContentObserver
registration. This fixes the leak by moving ContentObserver into owning
singleton which then notifies active MediaControlPanel instances.

Bug: 288244587
Test: updated unit tests
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d25127dd56075ea14e6ce76ee416fd96e317e988)
Merged-In: Idb1f3a750e6e87c56c645f53ce678a62e7181f11
Change-Id: Idb1f3a750e6e87c56c645f53ce678a62e7181f11

[automerger skipped] Merge "Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE]" into tm-qpr-dev am: 20bcbf38 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Keyguard: use transition state for syncing occlude [RESTRICT AUTOMERGE] am: 831787c5 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 917729f5 -s ours am: 39f216f9 -s ours am: 1e48b431 -s ours am: 48dbd258 -s ours am: b0f31ff6 -s ours am: b430f573 -s ours am: b8a57a32 -s ours am: af1a22f5 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 917729f5 -s ours am: 39f216f9 -s ours am: 1e48b431 -s ours am: 48dbd258 -s ours am: b0f31ff6 -s ours am: b430f573 -s ours am: b8a57a32 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 917729f5 -s ours am: 39f216f9 -s ours am: 1e48b431 -s ours am: 48dbd258 -s ours am: b0f31ff6 -s ours am: b430f573 -s ours am: 5a891a05 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 917729f5 -s ours am: 39f216f9 -s ours am: 1e48b431 -s ours am: 48dbd258 -s ours am: b0f31ff6 -s ours am: b430f573 -s ours

am skip reason: subject contains skip directive

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



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