Merge "Fixing the alarm icon for new p20 styles" into rvc-d1-dev am:...

Merge "Fixing the alarm icon for new p20 styles" into rvc-d1-dev am: 618a60b1 am: d830b14c am: 44f070d7

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

Change-Id: I15fd6f65e662290b42313c866b62e407a7443abe