[automerger skipped] Merge "Complete the revert on the wake lock on call...

[automerger skipped] Merge "Complete the revert on the wake lock on call tracker" am: 83808955 am: 8b8bcaf2 -s ours

am skip reason: Change-Id I6fffd302fadba170b1461647c7094a732d17eed1 with SHA-1 b64dc957 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1352888

Change-Id: Ibd38a499277a10587b47ccf78810471fcce1ba0d