Merge "Handle logical camera devices properly" into main am: 20768c89d7 am: b034621d77 am: bec8691480

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2901098

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