Merge "Always clear password reset token when removing device owner" into udc-dev am: 65108620

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



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