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