[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: 8d9fdbc7 -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: I877ba1de7ace69c8ef6588d52e644ee992ea4be1