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

Merge "Merge "Adjust the bottom sheet and save UI" into tm-dev am: df12093f am: 0a249726" into tm-d1-dev-plus-aosp am: b8528e9f

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



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