Merge "Merge "Complete the revert on the wake lock on call tracker" into...

Merge "Merge "Complete the revert on the wake lock on call tracker" into rvc-dev am: 5102080c am: 9d618020 am: e158897f" into rvc-qpr-dev-plus-aosp am: bff33fc7

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

Change-Id: I363526a0a80f1ace545b159558d611bc68dc4186