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

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

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