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

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

Change-Id: I0a06b092ac00c52d056308b9ebb4cc6225bc2176