Merge "Camera: Use originalFormat for getMaxPreviewFps" into udc-dev am: b63b68bcba am: 2c6bb16f32

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

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