Merge changes from topic "media_player_service_fuzzer" am: 7681f87c am:...

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

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



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