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: 9d618020

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

Change-Id: If61e67a8fa7a67997e90e5ecd4cf0125afb0e3bc