[automerger skipped] Merge "camera2: Ensure SessionCharacteristics and...

[automerger skipped] Merge "camera2: Ensure SessionCharacteristics and CameraCharactersitics can be used interchangeably" into 24D1-dev am: 3d85c9da -s ours

am skip reason: Merged-In Ia7ac40c768480a39fe0d1dd9392b5777b0fc2694 with SHA-1 22d63688 is already in history

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



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