Merge "camera: Fix AIDL VTS test" into tm-dev am: a2bf9cdae4

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/17011603

Change-Id: I33f888e635719b3c1f3024e8b1d715b5cf89e217