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

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

Change-Id: I5d66d3699e68f9c051744137338d4408c8b09130