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: Ie30fd5fe6227e5a1c05e51f5dbaf99e25ef25553
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>