* changes:
  Try to ensure tests run sequentially
  Update RemovalClient to support new biometric AIDL

The logic in ag/5108931 was intended to suppress the next return
animation if it would cross a task boundary, while preserving return
animations in all other cases.  However, it accidentally caused
excessive suppressions in the case of repeated back button presses.  The
reason is that although the sending activity is indeed only topOfTask
when moving forward cross-task, it's *always* topOfTask when pressing
back, so the state of the sending activity doesn't contain sufficient
information to feed this logic.

This patch changes to suppress when the receiving activity is task root,
which is a more direct and reliable signal.  (By definition, the return
transition from an activity will cross a task boundary if and only if
it's the task root.)

Fixes: 177780499
Test: New test in ag/13593522

Change-Id: Ia5751da6122dc1ddb557f45318712185fa0b3df9

Merge "Store VcnControlPlaneConfig in VcnGatewayConnectionConfig" am: bf8113b9 am: 8f2b5071 am: 559fd17e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I349d2f7e4c6bbeb28e0cd79be1ed5b6480558144

Merge "Allow optional package names in carrier configs" am: 68612ac5 am: c47df2e2 am: 7c7bb0cb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I65c281e0e6064b7335b9ca7942de1480d0e998c5

Merge "Create VcnControlPlaneConfig and VcnControlPlaneIkeConfig" am: a931d451 am: 14e64c42 am: e0610fe1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5f0336b434f42cba3bce793d8ec8d16a401bf117

[automerger skipped] Merge "pm: Require manifest.json for .dm (dex-metadata) files." am: 3ad85e40 am: 4b06a33f am: 94e09fbe -s ours

am skip reason: Change-Id I7a3c442bb27da5948bc9ead146c77213de6b56cc with SHA-1 12af11d6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I974e14f94aa3d3ffd07aff058d5777894cc71ad5

Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa486 am: cd59a1a0 am: abfa62f8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6780e5f6a10924f4b445fb100535961b3272166f

Merge changes from topics "media_metrics_network", "media_metrics_pb_metrics", "media_metrics_track_change" into sc-dev

* changes:
  Unhide media metrics APIs part 2: playback metrics
  Unhide media metrics APIs part 2: Network event
  Unhide media metrics APIs part 2: Track change event

Add hidden ConversationListener and registration in PeopleManager
for People Tiles to register a listener to individual
conversation storage changes for targetted updates.

Test: DataManagerTest, PeopleServiceTest, PeopleManagerTest
Bug: 178792356
Change-Id: I0cab6913c138d6ac515fed74741dd62bf967772b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d0999c36c05c3bd8e0f6e561cb50cc018936189

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia937988ef040a85a028ec45d69fad3f291860904

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie04f68e463251668d27d636c77dcd39558125ffb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If5333980d2af4d3d703fc7bbf1545214697c9841

Merge "[RCS UCE] Expose the OPTIONS APIs to support OPTIONS mechanism" am: c7baa486 am: cd59a1a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iddf0a66cee2204f7eeb50ea8ce6fe38f2a93b44b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1fedfbd2270ff5dac3e87e1ed83b0607a4ad2c30

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11323dffc28c43e9463bd9f0cbcc04fad29f7a6a

Don't move to next tag if the current tag is the START_TAG. The initial
implementation assumed domain verification state would write to a new
XML file, but it ended up being stuffed into packages.xml, so the
start tag is already read in the initial switch that calls into
DomainVerificationService.

Bug: 180527086

Test: atest DomainVerificationPersistenceTest

Change-Id: I623afb08985bf5377cb9ae240805aae5db9cd820

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2cda370ffe8babd62d8b7f38a09e35dd947c3384

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3d8da5f999b75a05ce45d2d2fe31e5e0fa0b792f

* changes:
  Update owner info with other keyguard indications
  Add test to allow icon-only messages

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I416fd516d93bd0505e3764fc607a2f5f13c3173e

Add stuff about when this functionality is available and what image
formats are supported.

Fixes: 180419617
Test: docs onle
Change-Id: I541f32a4021deee6848408898186dcffeff81a89