[automerger skipped] DO NOT MERGE CameraManager: Enable override to portrait by default for devices with the system property turned on. am: fccc2cb6 am: 0137c13d -s ours

am skip reason: subject contains skip directive

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



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