Merge "Fix a close button colors" into tm-dev am: 728839e6 am: 8ad9e976

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



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