Merge "Maintain auth entry status across providers" into udc-dev am: d77e0d99 am: 694fd0f2

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



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