Merge changes from topic "am-696dc6204a4c4fab86e2574447bf235e" into main

* changes:
  Merge changes from topic "am-7bdb02341529460ba6e7b9b0c201591d" into android15-tests-dev am: 4e6d8305ce -s ours
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Fix ActivityEmbeddingPlaceHolderTests when task is in multi window mode" into android14-tests-dev am: 938e515156 -s ours am: d5ef30f531 -s ours