Merge "DO NOT MERGE CameraManager: Provide flag for overriding camera output...

Merge "DO NOT MERGE CameraManager: Provide flag for overriding camera output to portrait." into tm-qpr-dev am: 0e7cbb04

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



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