Merge "Save hybrid flow uses dynamic type values." into udc-dev am: 19b25a75

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



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