Merge "Revise the save-flow" into udc-dev am: 91c9f5b7d1 am: d22949da23

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

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