[automerger skipped] Merge "DO NOT MERGE Camera: Enable session parameter...

[automerger skipped] Merge "DO NOT MERGE Camera: Enable session parameter handling for Rotate&Crop" into tm-qpr-dev am: ad86a8da am: 286c1aee -s ours am: 584103bc -s ours am: 51d8b018 -s ours

am skip reason: subject contains skip directive

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



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