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: Icaf97aa7659a0a7131d6ca2afcf606b9bda81c62