Merge "ITS: handle multiple focal lengths for single camera" into stage-aosp-tm-ts-dev am: 12361545c3

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/19561555

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