Merge "Revise the save-flow" into udc-dev am: 91c9f5b7 am: d22949da am: 94b0024e am: c71eb5b5

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



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