Merge "Fix: Flac Encoder timestamp for EOS" am: 16f2a93c37 am: 28f243e19c am: 131b839e3a

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

Change-Id: I21661cec68790d174002cd12bb94a29b28c74ce1