Merge "Reduce vertical margins in landscape add controls" into rvc-qpr-dev am: 354b3ec329 am: f6098d82bb

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

Change-Id: I41930afc4e1b0ce4dccae7ee1a7637cbf0f5f824