Merge "Complete the revert on the wake lock on call tracker" into rvc-dev am:...

Merge "Complete the revert on the wake lock on call tracker" into rvc-dev am: 5102080c am: b76dbecd am: 3fcd51f2 am: 6528e5ec

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

Change-Id: I03d064e60b720d3baf0352084a35d23b6c3bea38