Merge "Camera: Save the HIDL instances regardless of device version" am: 3e2ff26e75 am: 2fd3296122

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2503678

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