Merge "Merge "Fix CredDesc reg flow bugs" into udc-dev am: 09917cd2 am:...

Merge "Merge "Fix CredDesc reg flow bugs" into udc-dev am: 09917cd2 am: 5b9290b7 am: 5f98ed29" into udc-qpr-dev-plus-aosp am: b87021db

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



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