Merge "Adjust aspect ratio override portrait fullscreen" into tm-qpr-dev am: 5ba309cc

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



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