[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

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/+/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

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

Bug: 170432460
Test: refactoring CL. Existing unit tests still pass
Change-Id: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42
Merged-In: Ibce939eec341cb9f572d13a33762cc5bc6e2ef42

Some test failures can be hard to troubleshoot with current (lack of) logs
Adding more logs to CDM

Bug: 180060131
Test: presubmit
Change-Id: Ia57ae584244473fb36e701b1b8a2ba4b7fc69881

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