Merge "Fix CredDesc reg flow bugs" into udc-dev am: 09917cd2df am: 7e155c7413

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

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