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

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



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