Merge "Vertically center app icon with app name" into rvc-dev am: 46986caa19 am: 774417363b am: 64f34bbc88 am: ae478954a8

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

Change-Id: I19e7ed6d120b5a6cfdd8c79fbbf579dfb5b3cddb