Merge "Revise the save-flow" into udc-dev am: 91c9f5b7 am: d22949da am: a85a4104 am: 6ea301d5

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



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