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

Change-Id: Ia509c7c72338abd5028c2c8db6d572f642a637e4

Merge "Add PolicyDirection InfDef annotation to IpSecManager" am: 3498c7a5 am: 90d6cafc am: b0b2e115

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

Change-Id: I7f36a7e3fd1f0293203dd06ababa8c852a1ffc8d

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

Change-Id: Ic92bd41c9778bbd1bfce8598cb4b21c5b2e1e8ae

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

Change-Id: I2c3718d48073e2c07d269169effe90958c6f4a47

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

Change-Id: I2e7b34abfe7769160c383a0774cf3bb9635c46e2

[automerger skipped] Merge "Add system_server to readtracefs group" into sc-v2-dev am: 63f3810e -s ours

am skip reason: Merged-In I4139605eb7c5277887092b3d6a3fb26bf4f8f171 with SHA-1 57bbd009 is already in history

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

Change-Id: I731ce367049698eb07cb68857ba79cc982be2a22

Merge "identity: Add multi-document presentation support." am: 91b96e34 am: ae0d53c7 am: 62c776a7

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

Change-Id: Idb4d1ddd89a5ca58ccc852c67f098dad04cb1c5c

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

Change-Id: I8b5ade103c4275871e990369c36480013f47f129

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

Change-Id: I35b8ed6e2caa35f88b08b2282477eece24396e5f

Merge "Fixed an issue where a user could't go to the locked shade from dozing" into sc-v2-dev am: 5c3d8bc2

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

Change-Id: Id6d1a993dd6ff0bc7aa78cd8380f44c354f61db9

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

Change-Id: If577c5bfec59ce7547fe6dee00c69d010938e221

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

Change-Id: Ie346c21599cb0bc8793eedd816d3049596cd47ca

...only when the Task has no more running activities.

Send a TaskFragment info changed callback if the
callback is for the last activities to finish in a
Task so that the TaskFragmentOrganizer can delete
this TaskFragment. Otherwise, the Task may be
removed before it becomes visible again to send this
callback because it no longer has activities. As a
result, the organizer will never get this info changed
event and will not delete the TaskFragment because the
organizer thinks the TaskFragment still has running
activities.

Bug: b/214090984
Test: atest TaskFragmentOrganizerControllerTest
Test: atest ActivityEmbeddingLaunchTests
Change-Id: Idb58975f4bfb6c67ed6cda3dc6b7c33abd960bbd

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

Change-Id: I13fadbdb5df46e85beda32084d3cbb1b1e9becdd

Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1daa90f3 -s ours am: 058f043b -s ours am: 78a669f6 -s ours" into sc-v2-dev-plus-aosp

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1daa90f3 -s ours am: 058f043b -s ours am: 24d7e9b4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0e4f5f31b633810bee18561701c4645a49765685

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1daa90f3 -s ours am: 058f043b -s ours am: 78a669f6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I34f37d6e3a1e761c8fa7817cf027e7114c65e916

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1daa90f3 -s ours am: 058f043b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I2209a057d8020fcd6c81b03a0516795049ceab22

[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1daa90f3 -s ours am: 058f043b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I04e6b502aaaa1045f6ddc35287782dc737b63d65

This allows system_server to search/read tracefs entries. It is needed
for attaching cpu timeinstate bpf programs to tracepoints.

Bug: 208892266
Bug: 209513178
Bug: 214061655
Test: libtimeinstate_test
Change-Id: I4139605eb7c5277887092b3d6a3fb26bf4f8f171
Merged-In: I4139605eb7c5277887092b3d6a3fb26bf4f8f171

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 58f0393c -s ours

am skip reason: subject contains skip directive

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

Change-Id: Icde7db5533674db48fa0a9f55ce8a450a2514d28

[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 62b2a061 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I460cd8a4906352c297e5ecf4a7c33d65803a99dc

am skip reason: subject contains skip directive

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

Change-Id: I2b5bccdecf6597d1d9bee0c2e3d2edb346d8bd7d

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

Change-Id: Iaa43c34d7e80328dd17db09332dff98e227223be

Merge "Add OWNERS block to manage slippage during migration." am: d2a5e78d am: 36d9a8ca am: 23bc1031

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

Change-Id: I9a2de5b8edc28e49429e89c96e861d8ba910d312

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

Change-Id: I651585b35f2cf307caf48a2ddb78adafdfc64405

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

Change-Id: I5e2ee0259f73c43f93049dbd8ab369a708d31112

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

Change-Id: I05f6207e66382dbbe512eb11f8296b1dffacab1f

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

Change-Id: Iabc35b74ac6b52c6c4a1d45d6694600f1539d050

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

Change-Id: I5b080cd402df4aff505d4b512966326d845119be

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

Change-Id: Id11d9d83ac11ae4a5ab5a7a0dbbddde61b5d5bdb