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: Idc2e335245ce17c366bad5960e562f0c9ef26a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>