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

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

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



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