Merge "LockSettingsService: clear gatekeeper state when removing user" into...

Merge "LockSettingsService: clear gatekeeper state when removing user" into tm-dev am: 0681492c am: cbc63c2b

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



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