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

Merge "Save hybrid flow uses dynamic type values." into udc-dev am: 19b25a75 am: 4561a81f am: 058fe2a2 am: 1c4d1f96

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



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