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

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

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