[automerger skipped] Merge "Adjust aspect ratio override portrait fullscreen"...

[automerger skipped] Merge "Adjust aspect ratio override portrait fullscreen" into tm-qpr-dev am: 5ba309cc am: 7b083780 -s ours

am skip reason: Merged-In I84eaab4df045c93fb2c159a789852094caf9121a with SHA-1 129b8169 is already in history

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



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