Merge "Fine tune splash screen icon generation algorithm" into sc-dev am: e2ff050fbb am: 32832d9264

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

Change-Id: I4b15b80910cd29acae5300ef202540b5a6546bba