Merge "Save dialog changes so that buttons are shown in landscape - screenshots at http://shortn/_n52tNerWx6 Test: locally tested on pixel/foldable/tablet Bug: b/290785192" into udc-qpr-dev am: 015e9a3bcf am: 0f3ab63cec

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

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