[automerger skipped] 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 am: 5ff7d37023 -s ours

am skip reason: subject contains skip directive

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

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