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

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



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