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

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



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