Merge "camera2: Update mandatory streams for ultra high resolution sensors."...

Merge "camera2: Update mandatory streams for ultra high resolution sensors." into sc-dev am: f9158d22 am: a8bd945a

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

Change-Id: Ia678e2c87f16265d865a193c98fc09a1f7650a38