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

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



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