Merge "Merge "cameraserver: Fix HIDL vs AIDL CameraBlobId discrepancy; Move...

Merge "Merge "cameraserver: Fix HIDL vs AIDL CameraBlobId discrepancy; Move HIDL into seperate source files." into tm-dev am: 63d2f56b am: b49b5e22 am: 6e3b0e07" into tm-qpr-dev-plus-aosp am: cf4c903c

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



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