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

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

Change-Id: I6f24eb268f7d53177f41a69d66287db570cadb78