Test: statsd test
Change-Id: I25eaa3b8572074305e61506a693b636adbd3218d

It will be a global error by default.
Cherry pick lost changes from AOSP, for Android.mk and main.cpp.

Test: make checkbuild
Bug: 112564944
Change-Id: I6f1024fa5e31302af27fa9d5bac195e511f4ba20
Exempt-From-Owner-Approval: do not block on new warnings

There could be hundreds of jobs requesting connectivity. A single
ArraySet for all of them is inefficient. Splitting by UID makes
processing a little bit faster.
This should also help make job quota management easier.

Bug: 117841374
Bug: 111423978
Bug: 117846754
Test: atest com.android.server.job.controllers.ConnectivityControllerTest
Change-Id: I8b3b0209c6b57c91b13a69106b6fe8705b26d385

Bug: 117860032
Test: rebuild
Change-Id: I0cd0422891ca9a18168eb57cf4b61ad1089263f6

Bug: 117938033
Test: N/A
Change-Id: I654c56e6cd2089a8eb524d1f32c047dc25f4feff

- Allow apps to learn if users chose the importance of a given
channel
- Allow the asst to query channels and channel groups of installed
apps

Change-Id: Ic65dfdc79d5135940c1debb101b849b5837d78b5
Fixes: 118140597
Test: runtest systemui-notification

This reverts commit b35b5f7c.

Reason for revert: move the refactoring/renaming to another CL.

Test: statsd test

Change-Id: Ia3445beb0df813adba0d3d6e137a363e694b5da1

Test: make

See https://bugs.chromium.org/p/skia/issues/detail?id=8487

Change-Id: I185ffb3251aa154da55b0615f5837d9d090e5963

[automerger skipped] Merge "Add configurable default setting for assistant componentname" into pi-dev am: afda78ad  -s ours
am: 8b6a2e85  -s ours

Change-Id: Ic8d84bfc4e39f1777190e16a651e2cbf2313f8e6

[automerger skipped] Merge "Add configurable default setting for assistant componentname" into pi-dev
am: afda78ad  -s ours

Change-Id: I6f35d4dbe159cf34cfe541c68ff36e28d0cf1a2c

Bug: 116445483
Bug: 117164070
Test: review event log after performing relevant actions

Change-Id: I2032b5ecf960465b1369a0421f2493aa39386127

- The next activity after finishing should only consider in the
  same display.
- Make topRunningActivity goes through focusable stacks in a display
  instead of only uses top focused. Because it was used for legacy
  hierarchy that application tasks are put in a single stack.
- Update display configuration when a display becomes not containing
  running activity after finishing current activity to restore the
  original orientation.

Bug: 117861386
Test: atest ActivityStackTests#testFinishCurrentActivity
Test: atest ActivityDisplayTests#testTopRunningActivity
Change-Id: I15cafff01cf528681de64cd1b7da0547654e1103

* changes:
  Remove redundant prefix from UnbindReason
  Extract UnbindReason from InputMethodClient
  Remove redundant prefix from StartInputReason
  Extract StartInputReason from InputMethodClient
  Move some methods from InputMethodClient to InputMethodDebug
  Enable @UnbindReason annotation in IMMS
  Enable @StartInputReason annotation in IMMS
  Enable @SoftInputModeFlags annotation in IMMS
  Enable @MissingMethodFlags annotation in IMMS

Found two places where we forgot to remove TransitionListener in onTransitionEnd. I think it is important to clear it as if you reuse a transition object it will be leaked together with some views

Test: n/a
Bug: 64643817
Fixes in AndroidX: aosp/793641, aosp/795753

Change-Id: Iae0a9945a4158776f1a75c806c1f29efc049f96b