Merge "Add pushBlankOnStop fix." into main am: 1f4d9ab422

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

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