Merge "Camera: Adjust VTS tests for zoom override latency" into udc-dev am: 29bcd80ae7 am: 852f2772b9

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

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