[automerger skipped] Merge "Only allow RecordDVR to flush buffer when the DVR is stopped" am: 30e3efaaa5 am: 6c28ea88e5 am: ff5d180dd6 -s ours

am skip reason: Change-Id I5fa31c34cac83bb5952576adf86c5a31ec62d9b5 with SHA-1 0317f6db48 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1554520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c91a4bf43048e0282dc119697ebc75ba23c0ea0