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

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

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



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