[automerger skipped] Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" am: 2a2456d3 am: 2d4714ec am: c4bd236e -s ours

am skip reason: Change-Id I153721a0dc91ee5084a446ba1ce4f8ec9c51c4f0 with SHA-1 d805e562 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I11e05b564ab04486e24e191ad042c198d2ffe812

* changes:
  Update isLinkHandlingAllowed to mean all or nothing
  Update intent resolution logic with new rules

Merge "dumpsys: Print total DMA-BUFs exported from the DMA-BUF heaps framework" am: 2a2456d3 am: 2d4714ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6884503e2df2b28465443d7cea2393d39ffbffcd

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I04bc22715f7908c820a1ac4db2ea65352042acde

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38baa7aeefe2f779c3ae651154ea2c3958bb0882

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8902f84a28b5e588f45e9150aa5c7dc51db73174

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib99934e872bd05e6e3f13b091583fb00f6cd3517

* changes:
  Add additional tests for AOD/unlocked animations.
  Use new GX overlay for new AOD/lockscreen transitions.

Bug: 180023868
Bug: 179947838
Test: make, cts test that caught this issue no pass.
Change-Id: Id898d135ed64a704cc4707dcb796664d9b08264b

Merge "Use WakeupMesage for delayed events in VcnGatewayConnection." am: b244bfa4 am: fa7111f9 am: e060ec81

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3a8e85d22ecc396f9a85df2b8d7b12f3a25bc7cf

Merge "Acquire WakeLock while processing Gateway messages." am: 864b6249 am: 5cf38e3d am: 2429c94f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I113746da610d025448700ae5f491a55e55ef15a1

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf65600 am: fc00dda2 -s ours am: 70d6495d -s ours

am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0dcff72fd2a921e9e781acd5ffbb19a8a6a7c98c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I902ed407efa601a1f1ec9ec805aa69da2ccbc22a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I321b0209ed91a899aff486fab059ae00305eaa47

[automerger skipped] Merge "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/base" am: fcf65600 am: fc00dda2 -s ours

am skip reason: Change-Id I6e9103c3275cb2e6df5dc586588eccd7d2ab6b06 with SHA-1 47bc43a4 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7396eb4c772714f142c2c1f3831efa533772159b

Bug: 169693662
Test: atest SystemUITests
Change-Id: I8216a45ddb8649ea55abed5a5d6a398cb1e0256f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4ff4e8c5b7ec0cf8cf32cdb9f9728fe53c7a7f28