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: 533b4c8d" into rvc-d1-dev-plus-aosp am: 57f1c4bd

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

Change-Id: I91845cb4f127a91019884562a8a02a7e1203dca1