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

[automerger skipped] Merge "DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait." into tm-qpr-dev am: 0e7cbb04 am: 3543aa80 -s ours

am skip reason: subject contains skip directive

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



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