Merge "Vertically center app icon with app name" into rvc-dev am: 46986caa19 am: 3544556cad

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

Change-Id: Ie991527609cafde2cc7661328b86bd573bc367f5