Merge "Camera: Enable override to portrait by default" into tm-qpr-dev am: 8d06698f53

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

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