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: d64dacb0 am: 4cdf64de

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



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