This is safe, as getCommittedStatsMerged() supports null-able values for the List<ParcelFileDescriptor>.

Test: local compile and test; atom still pulls successfully.
Change-Id: I083ea1150f54c5970fbf60ae320809d27c4f3207
Merged-In: I083ea1150f54c5970fbf60ae320809d27c4f3207
Bug: 179008261
(cherry picked from commit e451771a)

ActivityMetricsLoggers build the proto with the compilation reason first
and then the compilation filter. Instead of changing the logging code,
we prefer to change the proto field order: this will facilitate the
speed up the resolution without the need to purge data or wait for
further release builds.

It is ok, because both fields are in fact int32 proto values so the ABI
does not change.

Test: m
Bug: 178108751

(cherry picked from commit cf676e8028c2611461dc3e009dd9fe771f44bdb2)

Merged-In: I36ec354d273dceace5245d7634c68ac63dc5a8cd
Change-Id: I03c701efe2181ae7796547267902f884007593eb

[automerger skipped] Merge "resolve merge conflicts of a13fc7f3 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0 -s ours am: 2fffbcb7 -s ours

am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea74 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic1b9ce053c64fc31c03ce0f984b25480de0eb52c

[automerger skipped] Merge "resolve merge conflicts of a13fc7f3 to qt-qpr1-dev" into qt-qpr1-dev am: 6d4ff2e0 -s ours

am skip reason: Change-Id I03072c65e1c7101538a7a20541d2ac59a2d213e3 with SHA-1 296fea74 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I409002a313787764b16cb23080c38e9273104638

Merge "resolve merge conflicts of a13fc7f3 to qt-qpr1-dev" into qt-qpr1-dev

Auto-generated-cl: translation import
Change-Id: I5da7c7256fc62de8672c76d3b59d2d25d1d5d544

Bug: 173421434

Change-Id: Ia5912645861a88e819189321861ffd81240c34d6
Merged-In: I03072c65e1c7101538a7a20541d2ac59a2d213e3

Merge "[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser"" into rvc-qpr-dev

If an Insets animation was cancelled before it could complete,
handle it gracefully.

Fix: 154381667
Test: Run monkey runner that on any window that has edit text
      atest InsetsControllerTests
Change-Id: I052a0455f536a1c839a2782e54f19143295ba6c6

[RESTRICT AUTOMERGE] Revert "[RESTRICT AUTOMERGE] Remove DPMS#getProfileOwner in favor of getProfileOwnerAsUser"

This reverts commit 10f79644.

Reason for revert: Explained in b/153995973#comment40

Bug: 153995973

Change-Id: I437400528cb98e9ce665ebc308bfe05f4f24ca13

* changes:
  Fix legacy APIs when VPN switches to suspended underlying network.
  Backport test coverage from aosp/1547496.
  Backport some helpers in ConnectivityServiceTest.
  Test for bugs with suspended VPN underlying networks.
  Add a test for getDefaultNetworkCapabilitiesForUser.
  Improve testing of CONNECTIVITY_ACTION broadcasts.
  Test passing an underlying network array with null network in it.
  Make testVpnNetworkActive more deterministic.
  Make MockVpn more realistic and easier to use.
  Increase test coverage for VPN info sent to NetworkStatsService.
  Simplify MockVpn.
  Test a VPN with an underlying network that does not yet exist.

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1e59e74decf4453eb0489bbc7139032b9e0387c

In automotive, onscreen components can be "ux restricted",
which means you can't use them at the moment for safety reasons,
for example while driving. Make DeviceDefaults buttons and
switches visually change to indicate to the user that they
are ux restricted.

Fixes: 178644245
Test: Manually
Change-Id: I5bccf4c0331fa496be9b90fb41381c9b674bf237

CancelNotificationRunnables just spin on the work handler of
NotificationManagerService, hoping that they get executed at the correct
moment after a PostNotificationRunnable and before the next
EnqueueNotificationRunnable completes. Otherwise, you end up in a bad
state where the cancel either is canceling notifications before they get
a chance to post, or missing its only chance to cancel the notification
(for instance, ActivityManagerService is the only caller that can cancel
FGS notifications).

This change attempts to execute a CancelNotificationRunnable at the
moment its run() method is called, otherwise it associates the runnable
with the latest enqueued notificaiton record which has yet to post.

It then associates PostNotificationRunnable with the delayed cancel
list, executing any missed cancel operations immediately upon finishing
the PostNotificationRunnable.

Test: atest SystemUITests NotificationManagerServiceTest; manual
Bug: 162652224
Bug: 119041698
Change-Id: I88d3c5f4fd910a83974c2f84ae3e8a9498d18133

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I223a724e33f676432d338c304775f1bd2092a8e0

[automerger skipped] [DO NOT MERGE] Close screenshot process on user switched am: a5141a4b -s ours

am skip reason: skipped by user mkephart

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I596ca54fdfa4a36b4e45687f5d746db87d947d6c

Auto-generated-cl: translation import
Change-Id: I08a2c5dd92bb39b48e4eb0ffc8c0703f4f60e25a

Auto-generated-cl: translation import
Change-Id: Ic3d09832985aa99be71c3ba982650405574cbda1

[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev am: 21eb07cf -s ours am: 3687a283

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I96ebd7c19ca124bc71cef6835d1ada5af0d90f04

[automerger skipped] Merge "[DO NOT MERGE] Close screenshot process on user switched" into qt-qpr1-dev am: 21eb07cf -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I06660d88e828c78714065433895b5540676b9656

Currently, we keep the process up even if the user switches,
meaning that in some cases (if the user is switched while the
screenshot UI is up) we will save images to the wrong profile.
This change makes ScreenshotHelper listen for user switches and
close the screenshot service, so that a new screenshot is
guaranteed to be constructed with the correct user's context.

Bug: 170474245
Fix: 170474245
Test: manual -- verified bad state occurs if user switches within
the timeout period, ensured that screenshots work immediately
after switching with this change.

Change-Id: I9d32d0928e6c2bda161d04555438d0dd7afef0ba
(cherry picked from commit 7ef1a5dd)

Auto-generated-cl: translation import
Change-Id: Iaecbd8915ca89a4b276cdfb31f4396f669c9bd4c

Auto-generated-cl: translation import
Change-Id: Ib2f07acb90c34869e55a1c5180c5229b6d420183

Auto-generated-cl: translation import
Change-Id: I85c9b3c74236cbfbf367a49bd3dc9406585ef337

Auto-generated-cl: translation import
Change-Id: Ie2f36a7e4734e28aa004f70fd7b9ff4394b02ec3

[automerger skipped] Merge changes from topic "cdm_overlay-rvc-dev" into rvc-dev am: f82228a7 -s ours

am skip reason: Change-Id I78673b7b95f4c3cb31fab180201eb17c9123bddf with SHA-1 43e8c61b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia351d28d32bb05f90e6fb0a2cac32b43da8a4592