Merge "Camera: Use area to check against 1080p size" into tm-qpr-dev am: daa52e99 am: 375d30aa

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



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