Merge "Camera: Use originalFormat for getMaxPreviewFps" into udc-dev am:...

Merge "Camera: Use originalFormat for getMaxPreviewFps" into udc-dev am: b63b68bc am: 2c6bb16f am: c3f7f0ca

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



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