Revert submission 25007252-release_migrate_split_keyguard_bottom_area

Reason for revert: Droidfood blocking bug: b/306101773

Reverted changes: /q/submissionid:25007252-release_migrate_split_keyguard_bottom_area
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d86d82cb6a05bec6ac3c0e2fa1ae08ffbbe6f8af)
Merged-In: I712480594ec25d39bcff6030ee81b2ba5900db35
Change-Id: I712480594ec25d39bcff6030ee81b2ba5900db35

Revert submission 25007252-release_migrate_split_keyguard_bottom_area

Reason for revert: Droidfood blocking bug: b/306101773

Reverted changes: /q/submissionid:25007252-release_migrate_split_keyguard_bottom_area
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:16588199a6f2c8f081f60490a647d2cad59c3b39)
Merged-In: I9d6a71a65cfa4de907adf9f540ba03a90365c172
Change-Id: I9d6a71a65cfa4de907adf9f540ba03a90365c172

Change-Id: I48a425a590ec043f1f5d0e82f649548c084c61cb

[automerger skipped] Merge "Allow per-app opt in to use system ANGLE." into main am: 6b30dd66 am: 94eb350c -s ours am: 540dcd10 -s ours

am skip reason: Merged-In I83b3c2ccbe7cb38f71418afde4254f48153ab6b3 with SHA-1 b3199f4c is already in history

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



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

* changes:
  Start Wear Debug service in System Server
  Add support for multiple data injection modes in Sensor Manager

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

[automerger skipped] Merge "Allow per-app opt in to use system ANGLE." into main am: 6b30dd66 am: 94eb350c -s ours

am skip reason: Merged-In I83b3c2ccbe7cb38f71418afde4254f48153ab6b3 with SHA-1 b3199f4c is already in history

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



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

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

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



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

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

Change-Id: I03f82498263ea292a2ce6d891bec097f8f5c8bcf

This reverts commit addff744.

Reason for revert: Likely causing b/305726574 b/305901414, will verify
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dd57a938c6d0f1c7af20a1dd4f84e32360e9d292)
Merged-In: Iacaab00ffe18b2fd6b5aeba6b5baf0794767430c
Change-Id: Iacaab00ffe18b2fd6b5aeba6b5baf0794767430c

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