[automerger skipped] Merge "Revert back wake locks in GsmCdmaConnection" am: 8f5c890a am: 33ecc7d3 -s ours am: 3d4deb31 -s ours

am skip reason: Change-Id Ia6906ea946ef6e0f5f5ab44428da0ac31d642c8b with SHA-1 7668b76c is in history

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

Change-Id: Iaf2eaed1dde76711eee905c0c28909cdc83b3dd4