Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4d79b74e70e910db662713a2d5ffdcfe287b084f

am: 526cd892

Change-Id: I91836c0d28cefbe5965586609d6eb521c8c2158a

am: 7d4e9b81

Change-Id: I144ab6fea2e9ece6f01004c03c85da72a8c069f2

am: 02b2b3d7

Change-Id: I09d38e6ed0426bc826722c1cdb5e7c79cf90adb6

am: 0fc0cc9d

Change-Id: I93b14c129711fad75fee3aa34f3a0fed04eb1182

am: e0482616

Change-Id: Iea671a7029e083bffee2bcaacfaa0df41f45c1cc

am: 54f40fa1

Change-Id: I908fe0868bbc85b959e9d41afa709019669131da

* changes:
  Fix transition between two occluding activities
  Use Keyguard orientation when unoccluding

When the profile is updated in guest mode, the user icon in QS footer
is not displayed correctly. To fix this issue, the tinting of
guest icon is applied only when the drawable is not UserIconDrawable.

Fixes: 65148947
Test: manual - switch to guest and update the profile.

Change-Id: I9690e9fd286703a25ee08d877c3dd7f4729e2b31

Add methods that were missing from the previous API update because the
update-api version used for that had different behaviour from the
current one.

Specifically overrides for methods that differ only in sychronization
are now considered API-worthy and weren't before (b/62576297).

All methods added in this commit are methods that exist in the base
class without synchronization and are synchronized in the class they are
now being added in.

Bug: 64807220
Test: m checkapi
Change-Id: I9bf1b3d02e6a8f04b93ec36c0adffb7eedad3ad3
Merged-In: Iff584fb72dc8d651f9482b573f4b8cec89840ca6

am: ced5e47a

Change-Id: Ie1316a273325cd5308cf9faab61dd0f43f899365

am: d019cce8

Change-Id: I24d4dbf1344b13c558aa6974dfee6fd0e8549056

am: 3cc1ad87

Change-Id: Ieda555f6f8bda35201327c6c6e0c97621b88671e

Merge "Nat464Xlat: interface notification handler on ConnectivityService" am: 91817b31 am: 02f6cfa4
am: f55c1ae9

Change-Id: I9116a493ca1cbdf6a25664a1b0017aa6c9b38eb4

am: 02f6cfa4

Change-Id: Ib224392c9a185f6bd79fd60cd5cb5549f2a7851e

am: 91817b31

Change-Id: I2f002cd197e2eeaaadadd747a6b33d264cd34433

am: 55309e79

Change-Id: I77d7a6e10d33b5e983d7652613c752829a886b01

am: 25e5a344

Change-Id: I25f08bcfd2d0774800f975cde195bc01f23734a9

When the AutofillService sets a PendingIntent to launch an activity when
clicking a chield view (for example, to lauch a web page displayign the terms
and conditions of saving something), the system must hide the Save UI and
restore it after the new activity is dismissed.

That sounds simple in the surface, but it requires a huge refactoring behind
the scenes, such as injecting a token in the activity intent and using that
token to hide / cancel the UI during some activity lifecycle events.

Test: lotta of brand-new shinning tests on CtsAutoFillServiceTestCases
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Change-Id: Ie8ec7aeb2c63cab68467046c1a9dcf85dbcc24ec
Fixes: 64309238

am: a119b38d

Change-Id: If9ac959f83de3627ff9950ee727acb3ab07c7b9c

am: f1c99fb4

Change-Id: I8349115cf2b7678ac6e24ea2aa06ed59bffa5930

am: edb2e0c7

Change-Id: Icf8873b268677a631659a7ee0f7816495f6acd38

This patch adds a layer of asynchonicity to the NetworkBaseObserver
callbacks implemented by Nat464Xlat in order to allow these callbacks
to run on the main ConnectivityService handler.

This allows to run interfaceLinkStateChanged and interfaceRemoved
callbacks in the same thread context as other Nat464Xlat methods and
solves the following issues:
  - NPE risk due to race between fixupLinkProperties called on the
    ConnectivityService thread and interfaceRemoved called as a
    callback by NetworkManagementService.
  - stale LinkProperties reads in both callbacks not called on
    ConnectivityService handler.
  - removes the race between stop() and interfaceRemoved().

This patch also:
  - removes/simplifies comments related to the threading
    model which are no obsolete.
  - extract clatd management logic from ConnectivityService into
    NetworkAgentInfo

Bug: 62997041
Bug: 64571917
Test:  runtest frameworks-net
       manually connected to ipv6 network and went to test-ipv6.com
Change-Id: I889d98e47423ff3d4746d6ed8015b265286e7c52

am: 61492c85

Change-Id: I7e3e6413d6edab90ae4ebd38d49aaf6157aed26c

am: b49fa218

Change-Id: Id97947d9f2d06c21777750ca17d877f6a13fbdf7

TRANSPORT_BLUETOOTH is a essential network type for wearable device.

For non-master branch, only listen to Bluetooth on wearable device.

Bug: 64881794

Test: Trigger Bluetooth on/off on watch, check if UpdateNetworkState()
got called.

Merged-In: I30e39943220597987320ea7843d7d36827fdd0c7

Change-Id: I30e39943220597987320ea7843d7d36827fdd0c7
(cherry picked from commit d6886710)

am: 68c8b4ad

Change-Id: Ib04b9a3d56e9daf61b299a30e24a3c8839819a00

am: 20d4df8c

Change-Id: Ic2246a97618c596dbdbf48cda39c2f5b66e3bfb6

Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am: f3f7a101" into oc-mr1-dev-plus-aosp

am: aee703e7

Change-Id: I188ac4c367db11cb33b67fe92df3a120e3c6fbce

am: f3f7a101

Change-Id: I233c1302fd7f86854255e64c06ef5c5130f77a29