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: f680ef57

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



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