Turn off overrideToPortrait where not needed. am: 7b14d5e6c4 am: e22739b8d7

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

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