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

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

Change-Id: I6db2d7bb3115149d3152684349e7e542af329d4e