[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 rvc-dev am: 78b27240 -s ours am: 30316315 -s ours am: 8ba21792 -s ours am: f72e484d -s ours am: 790fbfb3 -s ours am: 8dd736d3 -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/+/24341231



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

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -s ours am: ea9e51e3 -s ours am: 620b89a8 -s ours am: 7c2f597c -s ours am: 511dee95 -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/+/24341231



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

Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033 am: 4397e741 am: 89a3862e am: 8aaad2a2 am: c4e7a608

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -s ours am: 8ba21792 -s ours am: f72e484d -s ours am: 790fbfb3 -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/+/24341231



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

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -s ours am: ea9e51e3 -s ours am: 620b89a8 -s ours am: 7c2f597c -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/+/24341231



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

Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033 am: 4397e741 am: 89a3862e am: 8aaad2a2

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -s ours am: 8ba21792 -s ours am: f72e484d -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/+/24341231



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

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -s ours am: ea9e51e3 -s ours am: 620b89a8 -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/+/24341231



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

Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033 am: 4397e741 am: 89a3862e

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



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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -s ours am: 8ba21792 -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/+/24341231



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

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -s ours am: ea9e51e3 -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/+/24341231



Change-Id: Ib079ba4c58903aa23d5a75e2884d61d093a680fc
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/+/24341230



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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -s ours am: 30316315 -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/+/24341231



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

[automerger skipped] Require permission to unlock keyguard am: ad8e7e3b -s ours am: 5173b798 -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/+/24341231



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

[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b27240 -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/+/24341231



Change-Id: Ia6dd5dc6ce1587c4b046660d1ab542594447360c
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/+/24341231



Change-Id: Ib00d4c1cc73237298ebc08671d3bd426d9d54103
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/+/24341230



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours am: 6f9b58df -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours am: 17f9c965 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours am: 7bfeb1b9 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours am: 2f082e1a -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours am: fefbfeea -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours am: c7395484 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-dev am: c2a52889 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 9cce760c is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours am: d39052c7 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours am: 23598c2f -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours am: 6c73f28c -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours am: 0574a0ea -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-qpr1-dev am: 76b6d844 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: 9cce760c -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into tm-dev am: 6ddb560a -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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

[automerger skipped] Disable priority conversation widget for secondary users am: 7444c007 -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 95659d74 is already in history

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



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