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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd8fde8dddda9170acd9f5172b9ce3a6a4ba9727

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7535e67907c28c7b394492407c25f8afd06dbd58

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3bd6b3cb2d243047e9ac56619b95c7480201386c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3f0b51482a8f71152380d2ecc747c9e66717e2c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2fb83cec26f9c3ec980f358cae6e6a991c2c9545

* changes:
  Correct comment for safe mode alarm in VcnGatewayConnection.
  Implement VCN error callback use.
  Define VcnStatusCallback#onGatewayConnectionError callback.

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I990d82653ff47a5c99636655478765f20118ca08

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3e4f08b3c4f10d2d118e02f80f3a42d489552ed

[automerger skipped] Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bc am: 24162e16 am: 61487dfa -s ours

am skip reason: Change-Id Ibce939eec341cb9f572d13a33762cc5bc6e2ef42 with SHA-1 a24192a7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I26ecfc84f987c2a913180125c36022836d1b8e26

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" into rvc-qpr-dev-plus-aosp am: a32301cf -s ours

am skip reason: Change-Id Ic44d662936d1ff0cae7fbe915932b37aa4e4869a with SHA-1 784edef8 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I968524bdea890dec19e36c33d615dd45be4db2c5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c2d91313e3c8cb02faad0061e41c9d2379a76d2

Merge "Add the immutable flag to EuiccManager calls in RecoverySystem" am: 822856bc am: 24162e16

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia24b0b2e7a1155670aa7b0e0fbe4c805f2f77eae

* changes:
  [automerged blank] [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base 2p: 784edef8
  [LSC] Add LOCAL_LICENSE_KINDS to frameworks/base

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Icfdf4931737f026126350989f3072826901efcf8

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec7ac9ff98c8ad75998bfa079da3f2b2ecd47fa5

[automerger skipped] Merge "Add KeyChain Test API for the credential manager" am: 5eeae4c7 am: 5bddee5d am: 7e3ab781 -s ours

am skip reason: Change-Id I8487ebc13758a31639d55c8e380faa51d1cfd843 with SHA-1 ad53ef61 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4296856168c4a7261fd12a172e0336010688499e

* changes:
  Make CpuPowerCalculator's Estimators available to com.android.internal
  Implement EnergyConsumer type to ids map for targeted querying
  Add cpu proc file read throttling enabling/disabling

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7967cc8c972f5d141ba83a7e2cb882ddb529c663

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3e32e5e7fdc894bf2ce92fe955c92207e4d0fb4

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