Merge "Save hybrid flow dynamically handle type values." into udc-dev am: b89de24c

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



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