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

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

Change-Id: I90501e34ac25f3e068f7ddd9adfc88e0e326f35b