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

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



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