Merge "Fix crash when callback thread late launched after stream close." am: f0f2fcbe33 am: d53dce494e am: c0896dec98

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

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