Merge "Fix TV AlertDialog minimum button bar height" into udc-dev am: 634673bc am: b9ceec7d

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



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