Merge "Remove authenticator data if it was disabled." into sc-dev am: 25cc4a6305 am: 2fdf4be688 am: 725123263c am: 000d563160 am: e734a05701 am: 0686f09c4f am: 975b52ce75

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

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