[automerger skipped] DO NOT MERGE - Merge Android 13 am: 938ac89273 -s ours am: 6e413833b5 -s ours

am skip reason: Merged-In I19204b9f685c940887bdae9172eb892c69bf4441 with SHA-1 02c7c6903e is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/google/camera/+/2186769

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