Merge "Apply the mask to all splashscreen forground icons" into sc-dev am:...

Merge "Apply the mask to all splashscreen forground icons" into sc-dev am: 4f25b882 am: be233d1b

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

Change-Id: Ie41e2216014c9beaffdc69f8aeee94b89e3da4d4