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

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



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