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

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

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