Merge "DO NOT MERGE CameraManager: Enable override to portrait by default for devices with the system property turned on." into tm-qpr-dev am: 261247f604

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

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