Merge "Camera: Add debug command for zoom override" into udc-dev am: 10bd7093

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



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