* changes:
  [Tether] flip instant_tether for teamfood
  [Tether] Prefer mergedCarrierEntry() over connectedEntry()

* changes:
  Release MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA
  Modify inflation of ambient indication area to handle merge layouts
  Release MIGRATE_LOCK_ICON

Add the child view to the map, not the root view

Fixes: 301473935
Test: manual
Change-Id: I161410a5b4b3fc4a64a0dc0b841c90953e987493

Bug: n/a
Change-Id: I61f4a5e6633fb8d91be05e8454bf9b06ae66e1cd
Test: presubmit

Will be used to identify media projection sessions. For now will only be
needed for logging/metrics.

Bug: 304729581
Test: atest FrameworksServicesTests:MediaProjectionSessionIdGeneratorTest
Change-Id: I309eb4d0891df72e55b15747f27a5bba912a695d

Merge "Use lint database from api_version_system" into main am: 016f05cb am: f9b3e042 am: 40952cf4

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



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

This reverts commit addff744.

Reason for revert: Likely causing b/305726574 b/305901414, will verify

Change-Id: Iacaab00ffe18b2fd6b5aeba6b5baf0794767430c

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



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

Seems missing to add this flag while move task to front when running
shell transition.

Bug: 290999345
Test: verify with sample app which there should be no transition
animation when launch activity with FLAG_ACTIVITY_NO_ANIMATION.

Change-Id: Ibefc0dbd5cafcaea89f6ed5747facf38b6357cdb

Merge "Fix Partial Screenshare always launching split root when launching task from recents" into main

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



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

The cross-activity or cross-task animation can be weird when top
activity is translucent/floating/showWallpaper, skip animation for
those case.

Bug: 304976250
Bug: 305804265
Test: atest BackNavigationControllerTests
Change-Id: Ic95e5bb6baed89da8f5a5d0e29ae1040becd4c7a

Merge "Add a flag for keeping app work even if its declared sdk-library dependency is unavailable" into main

Bug: 295827951
Test: presubmit
Change-Id: I47b695d18af98d3b27eaf366c58a36571b1da6a8

[automerger skipped] Merge "Add additional overriding methods to signature files" into main am: 35863731 am: 8054883d -s ours am: a85e9495 -s ours

am skip reason: Merged-In Ifc1876eb60a4b716f72c86003dc9bea0081e9a4c with SHA-1 70523673 is already in history

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



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

[automerger skipped] Merge "Add additional overriding methods to signature files" into main am: 35863731 am: 8054883d -s ours

am skip reason: Merged-In Ifc1876eb60a4b716f72c86003dc9bea0081e9a4c with SHA-1 70523673 is already in history

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



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

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 31930f37 -s ours am: 9fc540ed -s ours

am skip reason: subject contains skip directive

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



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