Merge "Set the height of the right_icon in addition to the width" into sc-dev am: a5b0ed3b am: 6c9171b8

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

Change-Id: I78f706250445e4cbf2926ef9c1ec6d88d4e238e8