Merge "Address TODOs for Credential Manager" into udc-dev am: bf9648a7

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



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