Merge "Merge "Fix a close button colors" into tm-dev am: 728839e6 am: 8ad9e976" into tm-d1-dev-plus-aosp am: 84a8ca7b

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



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