Merge "Pillarbox if user applied aspect ratio and orientation unspecified"...

Merge "Pillarbox if user applied aspect ratio and orientation unspecified" into udc-qpr-dev am: f2795971 am: e2cbb4d7

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



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