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: 6f1a6ef9 am: fb1737a6

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



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