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

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

Change-Id: I81a7eac7208efbd303d2d994a6e0864df84b57f4