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

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

Change-Id: I7a84249d6a0550d6307f5b3b0e0c2628b5aeb108