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

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



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