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

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

Change-Id: Ie53b8fab6e56cc8df896e98260d6ab0c3c1f1ee7