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

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



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