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

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



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