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: cdb7755b

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

Change-Id: I22172396007bc362f272bf5a3ce40e5a80c5ae86