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

Merge "Handle logical camera devices properly" into main am: 20768c89 am: b034621d am: bec86914

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>