Bug: 303854744
Bug: 290381858
Test: NotificationBitmapJobServiceTest
Change-Id: If6d140098b011ff592076e9f7c4b3654ec70a70c

Bug: 290381858
Test: more readable
Change-Id: I9055feca9d4cfff83d6242c7557fc86e40798546

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 367818dd -s ours am: 83caa0c5 -s ours am: ea45c428 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours am: 2f3ba334 -s ours am: 67d29b6f -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 367818dd -s ours am: 8fcefcb3 -s ours am: 13e784fb -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours am: 316ec968 -s ours am: 1a8c5285 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 46a074f9 -s ours am: 2ec32c12 -s ours am: 384ff6bb -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 399ba04c -s ours am: abb44d2e -s ours am: bd062455 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

Merge "16k: Get the page size dynamically" into main am: 1a69b9e9 am: 9981aced am: ebd0e391 am: d4e102c2 am: 17b4923a

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 367818dd -s ours am: 83caa0c5 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours am: 2f3ba334 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 367818dd -s ours am: 8fcefcb3 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours am: 316ec968 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 46a074f9 -s ours am: 2ec32c12 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 399ba04c -s ours am: abb44d2e -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

Merge "16k: Get the page size dynamically" into main am: 1a69b9e9 am: 9981aced am: ebd0e391 am: d4e102c2

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 68def2a2 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 367818dd -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0b92ab39 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 367818dd -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 0f4534a4 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours am: 46a074f9 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours am: 399ba04c -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



Change-Id: I2b5202a65eeb67db5c64a74542593bc1397e9a65
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/+/2768551



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

Merge "Revert "Throw an exception when using RenderScript ScriptC with an API level above 34"" into main am: 9352c084 am: ff4aaec1 am: 2e47cdaa am: 8c5e5f1a am: b678df8f

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours am: 5287ed48 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours am: 5cf80925 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours am: 1b77ed7e -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

Merge "Revert "Throw an exception when using RenderScript ScriptC with an API level above 34"" into main am: 9352c084 am: ff4aaec1 am: 2e47cdaa am: 8c5e5f1a

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



Change-Id: I07002043053d8d6b169b09fdd4febfc442f73ad2
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/+/2768551



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: b73ed711 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



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

[automerger skipped] Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev am: ba7a30e9 am: 4f8e0db4 am: af9de2e6 am: 8efa785f -s ours am: be822171 -s ours am: 99a7448b -s ours am: fe385872 -s ours

am skip reason: Merged-In Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 with SHA-1 996896e6 is already in history

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



Change-Id: I0f030de0a3272cdadffe4d59585d225bf5257749
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/+/2768551



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

Merge "Revert "Throw an exception when using RenderScript ScriptC with an API level above 34"" into main am: 9352c084 am: ff4aaec1 am: 2e47cdaa

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



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