Merge "Ensure OK/Cancel buttons always shown" into rvc-qpr-dev am: b26c104b45

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2099b50557604fa6e3dfc14a3fd8d4ba6b54fbc8