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

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

Change-Id: I288301b65f2a3b7065874315c2c78d29b8c728ad