Merge "Resume HW after forced pause during flush" am: 15bd303c75 am: ea786fd733 am: bee2ce45da

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

Change-Id: I51ec4be285c0aa2e66efb18b3c3e975c423c50a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>