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

Merge "Merge "Save hybrid flow dynamically handle type values." into udc-dev am: b89de24c am: fbe198a7 am: 3cc15e36" into udc-qpr-dev-plus-aosp am: ce80f17b

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



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