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

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

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