[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: caa160ef24 -s ours

am skip reason: Merged-In I72b183fc7c8da980d2056bdf84d9425025e6adc5 with SHA-1 f7cbd7ae44 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/LegacyCamera/+/19094740

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