[automerger skipped] [ProxyController]Wake Lock Issue during...

[automerger skipped] [ProxyController]Wake Lock Issue during setRadioCapability error case am: 381dccc7 am: cf4059a6 -s ours

am skip reason: Merged-In Ia7162d9c50461600b8a8d8b9b0febbf0f6a7a52c with SHA-1 98ea73ac is already in history

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



Change-Id: I44db51626e8e08ee3963d8e656c289e1f38c676c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>