Merge changes from topic "media_player_service_fuzzer" am: 7681f87c am: 5b6968c8 am: 0ff3222c

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



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