Merge "Remove authenticator data if it was disabled." into sc-dev am: 25cc4a6305 am: 2fdf4be688

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

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