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

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

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