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

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

Change-Id: I00dae44f631f6dbab8b13f36e066a2eca55d68ff