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: f680ef57" into udc-qpr-dev-plus-aosp am: bf9c1ae4

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



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