[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811 am: c5324761 -s ours am: 00a442d6 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Ieb4192b6b11fdc8c88e61ac9ccc1d766aaf9fc20
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f868 -s ours am: 5410ad42 -s ours am: 3b8fef3d -s ours

am skip reason: subject contains skip directive

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



Change-Id: I12f703171de5876f106984d7cfe2948e9706f6c3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811 am: c5324761 -s ours

am skip reason: subject contains skip directive

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



Change-Id: I0b2c74777bf4bdce8f85e9d1b48f1188d951649b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f868 -s ours am: 5410ad42 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Id36cf5a90a2a4fad6096f827a878669ae0499b34
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

* changes:
  Tell NavigationBarView when mode changes.
  Revert "Revert "Remove Dep.get(CommandQueue.class) from NavBarView""

Merge "[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService." into sc-dev am: c8347811

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



Change-Id: I9a9bf3b5f7ccdc1198c012e495cd42c55f51f296
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from FingerprintService. am: ac89f868 -s ours

am skip reason: skipped by user jbolinger

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



Change-Id: I076199e318c89af583c64a8bd66ec854719cc975
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

This will be needed for split-shade expansion motion. The absolute value of the expansion will be used instead of fractions.

+ refactor multiple primitive parameters into a single high-level type parameter.

Test: unit tests
Change-Id: Ia35f79ff42f29e44e4123776be30ebc33ee2aab0
Merged-In: Ia35f79ff42f29e44e4123776be30ebc33ee2aab0

Merge "Revised API documentation of getLocationOnScreen, getLocationInWindow, and getLocationInSurface to include multiple-screen behavior and remove mentions of "global" coordinate space." into tm-dev

Revised API documentation of getLocationOnScreen, getLocationInWindow, and getLocationInSurface to include multiple-screen behavior and remove mentions of "global" coordinate space.

Test: Built API docs
Bug: 172573956
Signed-off-by: joneckenrode <joneckenrode@google.com>
Change-Id: If2200f9daebaa7eb106340bcc5707c20a3df34e6

[automerger skipped] Merge "[DO NOT MERGE] Force extra nav bar provide side gesture insets" into sc-v2-dev am: c0bcb303 -s ours

am skip reason: subject contains skip directive

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



Change-Id: Idf74d2b5748cc0cb842201dc12f6fec00f9171a8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

[automerger skipped] [DO NOT MERGE] Force extra nav bar provide side gesture insets am: 1921f8c1 -s ours

am skip reason: subject contains skip directive

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



Change-Id: If5ed4bc450721727edac7b3553693e758b411934
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Fix: 229304143
Test: manual and DisplayContentTests
Change-Id: I3136db620afdf016a900f3441ee3010ae9662f0f

Moving logic for WorkPolicyInfo to SettingLib so that they can be
accessed from PermissionController

Bug: b/229889270
Test: manual
Change-Id: I282a4e05791a8d738795999ca5c3ab68e0cd0985

Bug: 203105544
Test: statsd_testdrive 441
Change-Id: I4e9fd8e5cdb3423ee68ccd839d41ed5c69386885