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

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

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



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