Merge "Merge "Remove the border around the icon when in dark mode" into...

Merge "Merge "Remove the border around the icon when in dark mode" into rvc-dev am: c8c2bf13 am: 8521effb am: 8bb5d1a6" into rvc-qpr-dev-plus-aosp am: 58873934

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

Change-Id: I6dfdbea49a13262e4dcc85d7c1fb71e5ca8cc8e1