Change-Id: If66a0c7c3c9d4456f9f141244b654b55ca63e966

Merge "Make bootclasspath srcjar available to make" into main am: 53565bfd am: 5fc30c4d am: 6be73d41 am: 2efdf170 am: 28a310aa

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



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

Merge "Ensure we reset reparenting when launching new splits" into udc-qpr-dev am: 60d91d2d am: 7a6ea9c0

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



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

Merge "Make bootclasspath srcjar available to make" into main am: 53565bfd am: 5fc30c4d am: 6be73d41 am: 2efdf170

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



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

Merge "Make bootclasspath srcjar available to make" into main am: 53565bfd am: 5fc30c4d am: 6be73d41

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



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

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



Change-Id: Ie2e54a29c8f6399a5b64530cd19f35b1b65a1541
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/+/2760386



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

- Follow up to ag/24812535, there were a few cases where we don't call
  into prepareEnterSplit() but still need to reset the reparenting
  state to prevent trampolines from breaking splitscreen upon entering.

Fixes: 292454704
Test: Launch split from the menu for app that launches a trampoline
Change-Id: Ia0d825192c3ec78991a75f0501e7ece9d75cb4af

Addressing the comments on the previous CL.

Test: ./scripts/run-all-tests.sh
Bug: 292141694
Change-Id: I0a1daa6d336cf80a00afeb8f067422a4baf95475

Bug: 245989146
Change-Id: I84dfce5d216a5065611bf63f61e803a93e76b58f
Test: check gittiles rendering

Can be used to understand the current form factor in Compose code.

Bug: 299343639
Test: as part of the next CLs
Change-Id: I53a6fc3e5a187e04c0b140ad043ff0caa455ec5f

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



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

Merge "[Terms of Address] New hiden APIs, setSystemGrammaticalGender and getSystemGrammaticalGender" into main

Merge "Run TaskDisplayArea recovery during sleep tokens" into udc-qpr-dev am: f6905f1c am: 24fa4027

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



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

* changes:
  Add KEYGUARD_ROOT_VIEW_USE_COMPOSE flag.
  Set KeyguardRootview invisible when shade expanded

Bug: 301969856
Bug: 301968149
Test: Check flags file.
Change-Id: I494078de8f85d5c9e6dc0cd33994ee9f3bea3c3c

KeyguardRootview has a higher z index than notification shade and is
visible when shade is expanded. Therefore any touch events handled in
keyguardrootview can intercepted.

Fixes: 301968154
Test: Open shade and tap on qs buttons and such.
Change-Id: I65a8a830ff3b31ee83c017c6e29ddd7abfd0c4c0

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



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

Bug: 295269178
Test: atest MediaHierarchyManagerTest
Change-Id: I7a3eefa759ef69c6d74f8509a3ef95c4a27ff859