Merge "Fix lock task clearing for affiliated users" into udc-dev am: 029eb856 am: 065eefea

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



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