Merge "Fill dialog/save ui style refinement" into tm-dev am: 0e0fd1d8 am:...

Merge "Fill dialog/save ui style refinement" into tm-dev am: 0e0fd1d8 am: 5296ba27 am: 0fbc5826

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



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