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

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



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