[automerger skipped] Merge "Per-app compat treatment for overrideToPortrait."...

[automerger skipped] Merge "Per-app compat treatment for overrideToPortrait." into tm-qpr-dev am: 0c4715aa am: 38dbc64b -s ours

am skip reason: Merged-In I190963c4f8dfba29dab7570397c33f44cab702e3 with SHA-1 0b4857a5 is already in history

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



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