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

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

Change-Id: I8b042cd45aa113a157712379bf4b90d09524cf3e