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

Merge "Camera: Save the HIDL instances regardless of device version" am: 3e2ff26e am: 2fd32961 am: 0b14fba8 am: 77a496a4 am: ce2464c4

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



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