Merge "Vertically center app icon with app name" into rvc-dev am: 46986caa19 am: 3544556cad am: 1481d9cb7e am: 3782a292e1

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

Change-Id: Ia53963f3e7b660688eb313e4d9c2dae4231a8229