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

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

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