Merge "Make overlay dismiss button color_tertiary" into tm-dev am: a1b21a7c

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



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