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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c3585eabe03f90d84110538e515ffb1a529be41