[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours am: 4eef0a5a -s ours am: f51a32c2 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours am: d577fd09 -s ours am: 64fd1622 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours am: 2964d2ac -s ours am: 5bc49608 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s ours am: d7cadc03 -s ours am: 0bfd4922 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours am: bedfad32 -s ours am: e17affc8 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours am: 7c2b1325 -s ours am: d5d56cf4 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -s ours am: 3371c14a -s ours am: 1cb52a9c -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours am: 17b2d055 -s ours am: 435be105 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours am: 658c7832 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours am: 1c170fba -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours am: a8da8cbb -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s ours am: 1bedc66e -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours am: 4eef0a5a -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours am: d577fd09 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours am: 2964d2ac -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 41bc7c00 -s ours am: d7cadc03 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours am: bedfad32 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours am: 7c2b1325 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -s ours am: 3371c14a -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours am: 17b2d055 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours am: 5e73bd81 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 6568e40b -s ours am: 57e16d7f -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours am: 75495d90 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours am: f4eace97 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours am: 8fbbc0c9 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 712ec1f4 -s ours am: 8e952270 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours am: c1e069ef -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Require permission to unlock keyguard am: 7f28e3ea -s ours am: cbdde0eb -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-v2-dev am: 03279550 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-qpr1-dev am: aac427df -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 6568e40b is already in history

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



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

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 41bc7c00 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into sc-dev am: b25ee866 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 712ec1f4 is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into tm-dev am: 1d243469 -s ours

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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

am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1d is already in history

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



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