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

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

Change-Id: Ia8f3622e8bba467e19e8410dc5409b766e736f91