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

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



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