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

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

am skip reason: Merged-In Ia7162d9c50461600b8a8d8b9b0febbf0f6a7a52c with SHA-1 381dccc7 is already in history

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



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