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

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



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