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

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

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