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

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



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