Whiskey icon patch

Bug: 406894719
Test: local test
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d3c4a764721ee8936b9bfcddedd2189f4c44cfbe)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:923b10bd201074c4bd49857030a89572769e5f7b)
Merged-In: Iead9c06835a227ae870ba71d70a9e9461ef64be9
Change-Id: Iead9c06835a227ae870ba71d70a9e9461ef64be9
4 files changed