Merge "Bug fix for failing test. Process start times out due to long sleep time, which should only be done for wedge." into main

Bug: N/A
Test: N/A
Change-Id: Ib2776c8d79c7a040177790ec3420c62604597a34

Bug fix for failing test. Process start times out due to long sleep time, which should only be done for wedge.

Bug: 300996262
Test: atest FrameworksMockingServicesTests:AsyncProcessStartTest#testNormal
Change-Id: Ia58c5f1865ebc050cc55e98b6d039339f6205723

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



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

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

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



Change-Id: Idfed46f5e1112d0c59cd8890b60cb1b3daafd511
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/+/2770620



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

* 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