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

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

Change-Id: I88292c4df140f470a9df18db2de70e5c03ce3e75