Merge "Per-app compat treatment for overrideToPortrait." into tm-qpr-dev am: 0c4715aa

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



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