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: bf5280b1 am: af4ec372" into udc-qpr-dev-plus-aosp am: 261c3f61

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



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