Merge "Always clear password reset token when removing device owner" into...

Merge "Always clear password reset token when removing device owner" into udc-dev am: 65108620 am: 4726d6af am: 9cbad151 am: 28221146

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



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