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: 252ef2f9 am: 5d749ceb am: 362d7988

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



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