[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours am: 8b2d61eb -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



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

[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527 -s ours am: 0b9294f5 -s ours am: 3eb66b1a -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



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

Merge "Move page count to rememberPagerState" into aosp-main-future am: e8a2bcbd am: f3decd99 am: 7317c15e

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



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

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours am: 876446b1 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



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

[automerger skipped] Revert "Revert "Update type in AnimatedNavHost"" am: 8d59a527 -s ours am: 0b9294f5 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



Change-Id: Iddf1ebe60ac6f062731c01c0006c031b46fc74d6
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/+/24860151



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

[automerger skipped] Merge "Revert "Revert "Update type in AnimatedNavHost""" into aosp-main-future am: cfcad9c2 -s ours

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



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

am skip reason: Merged-In I057a43d5bf64ad602d822991ad1a688aee5f2bc7 with SHA-1 65f2c18d is already in history

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



Change-Id: Ie63e3119194b0b772fbb2e72ed217a4bd89f0d0c
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/+/24860151



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

Merge "Move shortcut falsing shake and vibration to onclicklistener" into udc-qpr-dev am: 7adeffd9

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



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

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091 am: ea26d808 am: 08ae7288

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



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

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091 am: ea26d808

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



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

Merge "Added new framework-pdf jar inside MediaProvider module" into main am: e6c4de26 am: f9641091

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



Change-Id: Ie19ac593c83393b7938f2f533f703e15b89ec6bf
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/+/2760388



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

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af043 -s ours am: 81dd77b9 -s ours am: d0b7962c -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



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

[automerger skipped] Merge UP1A.231005.007 am: f984307b -s ours am: ac281ffd -s ours am: 927b4b9b -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



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

[automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: ee8af043 -s ours am: 81dd77b9 -s ours

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



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

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



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

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



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

am skip reason: Merged-In Idcbd0f2ba87290f090d693f0a64cb46fe8270b95 with SHA-1 5fdfd60f is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours am: 58d8f1e2 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours am: 655266f8 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: 0542b70d -s ours am: 49e063af -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 6dfd94a1 -s ours am: 9e96ae63 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours am: cf11a619 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours am: 85a23a76 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: 0542b70d -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 6dfd94a1 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours am: ae621908 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours am: 4d8bb9af -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: a2afc42c -s ours am: d06e0acf -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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

[automerger skipped] Merge "Restrict number of shortcuts can be added through addDynamicShortcuts" into rvc-dev am: 0e03b8d4 am: 87de7ffc -s ours am: 285b8a1b -s ours am: 79be2c99 -s ours am: 39abde02 -s ours am: 6b74b34a -s ours am: b4c64978 -s ours am: 8b6c78c7 -s ours am: 4420eab7 -s ours

am skip reason: Merged-In Ib3eecefee34517b670c59dd5b8526fe9eb24f463 with SHA-1 3215e73e is already in history

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



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