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

Merge "Merge "Fixing the alarm icon for new p20 styles" into rvc-d1-dev am: 618a60b1 am: 85285519" into rvc-qpr-dev-plus-aosp am: 2a6c2525

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

Change-Id: Ib7a7ef98731d47ac311f0406ce69379273a7ff13