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

Merge "Address TODOs for Credential Manager" into udc-dev am: bf9648a7 am: 605cd687 am: 00a7d9bb

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



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