Merge "Adjust the bottom sheet and save UI" into tm-dev am: df12093f

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



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