[automerger skipped] Merge "Camera3: Handle stream format override for shared output stream" am: b49dc95bae am: 006131638a
am: 66010c272b  -s ours

Change-Id: I758f8b68cef1912c0c0787527ac68eac488251a8