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: e734a057 am: 0686f09c am: 975b52ce am: 8f3751c4 am: 73fe2376

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



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