Merge "Merge "Fix lock task clearing for affiliated users" into udc-dev am:...

Merge "Merge "Fix lock task clearing for affiliated users" into udc-dev am: 029eb856 am: 26338322" into udc-d1-dev-plus-aosp am: 3cfca38c

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



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