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: fbe198a7 am: 81c4e1ba am: e2ce76dd

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



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