Merge "Use a filegroup for the AndroidManifest.xml input" am: 7ebe6c53 am: adf08825 am: d8c406bc

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



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

Merge "Merge "[Unfold Animation] Expose hinge angle provider interface" into tm-qpr-dev am: 91a76fbd am: 2ec94ab5" into udc-dev

Merge "Add two new SearcTargetEvent types to represent user action to delete or dismiss a target." into udc-dev

Merge "[Unfold Animation] Expose hinge angle provider interface" into tm-qpr-dev am: 91a76fbd am: 2ec94ab5

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



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

Merge "Merge "AudioService: fix BT SCO volume mute" into tm-qpr-dev am: 77c92478 am: e5a19023" into udc-dev

* changes:
  Add test to verify uid state isn't changed when widgit visibility is
  Dump if app widget visibility has changed in commitUidState

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



Change-Id: Ie292b03fe7420625631e3081c2f4194679af0425
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/+/2469525



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

Merge "Move java_api_contributions closer to their source" am: 39536eba am: 881e2ef7 am: e2766148

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



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

[automerger skipped] Merge "Skip reading config file that does not exist" into tm-qpr-dev am: a2c6c3ac am: caf9e106 -s ours

am skip reason: Merged-In I64a62c4aa66ac045aa4b1ddf1ad2e51d7bf4ca5b with SHA-1 15942b75 is already in history

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



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

Merge "Do not clear activity type in clearSizeCompatMode" into tm-qpr-dev am: 79ffe1cc am: be8a2737

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



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

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



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

[automerger skipped] Merge "[DO NOT MERGE] Transitions: PRIMARY_BOUNCER -> GONE" into tm-qpr-dev am: ec3511ca am: 59c5274f -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] [DO NOT MERGE] Transitions: PRIMARY_BOUNCER -> GONE am: f8118c25 am: b3a39d21 -s ours

am skip reason: subject contains skip directive

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



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

[automerger skipped] Merge "Added few more APIs support" am: cb23451c am: b1202b00 am: df28cf9c -s ours

am skip reason: Merged-In Id3c0f3afc7a5fc95beb4dde0c570520626244761 with SHA-1 1f1f39be is already in history

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



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

[automerger skipped] Merge "Removed unused method" am: 86198033 am: 27664fa3 am: e14c0ef7 -s ours

am skip reason: Merged-In I70a26d424eca093921572ce610ea495f603b01c6 with SHA-1 07fc4b48 is already in history

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



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

[automerger skipped] Merge "Add getSubscriptionId API" am: e059f501 am: a33764a5 am: f73c86c7 -s ours

am skip reason: Merged-In I67cb2bade2c9496a50cccd81fa8f6edc57ede967 with SHA-1 24839819 is already in history

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



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

[automerger skipped] Merge "Renamed methods for clatification" am: f8db4fe1 am: e3caa55d am: e8011bd7 -s ours

am skip reason: Merged-In Idf33e6db48e7ccba72b5e389039f68011949938a with SHA-1 983f9f99 is already in history

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



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

[automerger skipped] Merge "Change get/setUserHandle to get/setSubscriptionUserHandle." am: cd2bdd1e am: 34d1c0a1 am: d2839e58 -s ours

am skip reason: Merged-In I6df0579cd33e2b2efcd8477270160b46c10d0a3a with SHA-1 9bea0150 is already in history

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



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

Bug: 268405873
Test: Manual
Change-Id: I7ab126e5b3323d66e6f9fce994944aab1a6c9b36

Bug: 265064188
Test: atest AppChannelsBypassingDndPreferenceControllerTest
Change-Id: Ic6f921fc0d0d6da03b05be8b2c2b0439241ebdd9

Fixes: 271996196
Test: atest com.android.server.devicepolicy.OwnersTest
Change-Id: I6dab9c717349545ab9be27ea12a251dcd5ce6025

Commands like "adb shell cmd dreams", "adb shell cmd dreams dump",
and "adb shell cmd dreams help", should all work. Also, when the
other commands are called without being root, print the exception
to the PrintWriter instead of to logcat where it may not be
noticed.

Fix: 272000370
Change-Id: Ida3c9bdb8b54a8897fe8261222f4cb9b1a08e0e4
Test: adb shell cmd dreams help # accepted
Test: adb shell cmd dreams start-dreaming # rejected

It retrieves the system user using the UserTracker, so the NoteTask is associated with the current logged in user or system user if locked out (b/267634412).

Additionally, clean-up the code by removing the unnecessary optional parameters (b/269724992) and adds the missing flags for opening note task correctly (b/271280243).

Test: atest SystemUITests:NoteTaskControllerTest

Fixes: b/267634412
Fixes: b/269724992
Fixes: b/271280243

Change-Id: Id6e1261dac7855c35c6d4a00e362d84709816339