Merge "Camera3: Add flush support to HEIC composite streams" into rvc-dev am: 22e5822304 am: 415d30c4be

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

Change-Id: I138264b4d6add43182c5bacafd20df4588e70a72