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

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



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