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 am: 47f7d312 am: 6d7cdd70 am: 5bf6de13

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



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