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 am: 70dc81fa am: 1bab041d

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

Change-Id: I45deafa101ca151e004d8193b25d4c9fc1fbac97