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

Merge "Remove authenticator data if it was disabled." into sc-dev am: 25cc4a63 am: 2fdf4be6 am: 72512326 am: 000d5631

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



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