[automerger skipped] DO NOT MERGE CameraManager: Provide flag for overriding...

[automerger skipped] DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait. am: ddc70c75 am: d420a8f6 -s ours

am skip reason: subject contains skip directive

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



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