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

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

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



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