Merge "Merge "Save hybrid flow uses dynamic type values." into udc-dev am:...

Merge "Merge "Save hybrid flow uses dynamic type values." into udc-dev am: 19b25a75 am: 4a719edd am: 555db83a" into udc-qpr-dev-plus-aosp am: 65ae69c1

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



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