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

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

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



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