Merge "Fix vertical height of emphasized action buttons" into udc-dev am: f6adbe0d

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



Change-Id: I2edd5587375c6d8772f715248fcd9f79d57e993d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>