Merge "Revise the save-flow" into udc-dev am: 91c9f5b7 am: 69093fc8 am: 440c3327 am: 9e57dafd

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



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