Merge "Do not remove the k_k until all users are unlocked" am: 4d20410bf4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec47eb1c36b136705a8302cd03497f9290ff9c2c