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

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



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