Merge "Camera: Fix camera id equal check" into main am: 237b6c21d8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3201770

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