Merge "Fix incorrect usage of lock object" am: d09e4c7bbe am: a47acb652e am: f15354a13c

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telecomm/+/1379176

Change-Id: Ia7b98b3f7b3cf711aaacbd306aae9be7d316b8e4
diff --git a/src/com/android/server/telecom/InCallTonePlayer.java b/src/com/android/server/telecom/InCallTonePlayer.java
index 7500436..524d119 100644
--- a/src/com/android/server/telecom/InCallTonePlayer.java
+++ b/src/com/android/server/telecom/InCallTonePlayer.java
@@ -439,7 +439,7 @@
                 @Override
                 public void onCompletion(MediaPlayer mp) {
                     Log.i(this, "playMediaTone: toneResourceId=%d completed.", toneResourceId);
-                    synchronized (this) {
+                    synchronized (InCallTonePlayer.this) {
                         mState = STATE_OFF;
                     }
                     mToneMediaPlayer.release();