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: I16e131d65dd073e7906768ba5de1b308e01574a1