* changes:
  Improve unit tests
  Only auto-opt in real caller

[automerger skipped] Merge "Disable failing tests and revisit after holidays" into aosp-main-future am: b7986e07 -s ours

am skip reason: Merged-In Ia79c3a4c487b3cbb3335b386630baefa8d661a64 with SHA-1 3065c363 is already in history

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



Change-Id: I66aac7a323c71759fd856a983e4b59687b389474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In Ia79c3a4c487b3cbb3335b386630baefa8d661a64 with SHA-1 3065c363 is already in history

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



Change-Id: I699a4bcf78790549fd6a932317ac3fc82fa2c4d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: I830de62f62c28375b4a4fe0402c9ab919b72fbdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "Revert "Disable failing tests as cause is investigated"" into aosp-main-future am: 19f18e0b -s ours

am skip reason: Merged-In Icacfc750c739c638bc06788df84cdc17334c696d with SHA-1 86bed8a2 is already in history. Merged-In was found from reverted change.

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

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



Change-Id: I472c816ee74968533481489a924798bddc27cccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In Icacfc750c739c638bc06788df84cdc17334c696d with SHA-1 86bed8a2 is already in history. Merged-In was found from reverted change.

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

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



Change-Id: I260855bdebb03882d16ca4d0f0a4ee9b3ecb6ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: I0039fd64b6af6ee09f7ad602d32b1421d645551c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 316989461
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3065c363c66b2885889202d7288474b145d5888a)
Merged-In: Ia79c3a4c487b3cbb3335b386630baefa8d661a64
Change-Id: Ia79c3a4c487b3cbb3335b386630baefa8d661a64

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



Change-Id: Iba060ee7417ada6cb41a1f9d9020fd8a259ae199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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



Change-Id: Ie91b90300bbfe0214de20e8254a0006cf4249eef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  KeyguardMediaController: Invalidate NSSL only for MediaContainerView
  KeyguardMediaController: Log Active Container on refreshMedia

Flag: N/A
Fixes: 325867085
Test: atest CredentialInteractorImplTest
Change-Id: Id87e49867efcc0a06318ea1e235e3a94f1d5fbf8

This reverts commit 7aa2a3af.

Reason for revert: b/326075332

Change-Id: I0da1ac971619b22f34cb69432df1ef21d1c84c4a

* changes:
  Fix clock flicker after unlock
  Fix hun/pulsing swipes

Bug: 318310357
Bug: 298898436
Bug: 298891941
Test: build pass.
Change-Id: I009d8a25ae738f98c2f02f70eb4ee414e1c0ddef

Bug: 325470219
Reference doc: http://shortn/_0GAh1voy52
Test: Deployed on Phone,CTS tests
Change-Id: Ie5488ca25eea4f7eb90c174737fdd8675ace6c5a