Merge "Fix conditional log line in MediaPlayerService" am: 1a3118f3c2 am: a9c4cff998 am: b123a5b15d

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

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