Merge "Camera: Correct the U/V plane selection for HEIC streams" into main am: ab7efbbba0

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

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