Merge "Fine tune splash screen icon generation algorithm" into sc-dev am:...

Merge "Fine tune splash screen icon generation algorithm" into sc-dev am: e2ff050f am: 20c556f1 am: 5d1237a1

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

Change-Id: I8484ed033b2639515510beca6a20be12ae2a7185