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

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

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



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