[automerger skipped] Merge "RESTRICT AUTOMERGE: Camera: fix wrong signalStreamFlush call" am: 43b32b29 am: a4217304 -s ours am: 85bf50bf am: a42085c0

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1373408

Change-Id: Ida6a968436a287ad17501ac13eeb4206709a1ea2