Merge "libmediaplayerservice: Explicitly force callbacks to stop running" into...

Merge "libmediaplayerservice: Explicitly force callbacks to stop running" into main am: 31782d7c am: e108058a

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



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