[automerger skipped] Merge "Fixed WFC activation issue" am: d91e0df9 am:...

[automerger skipped] Merge "Fixed WFC activation issue" am: d91e0df9 am: 1bce589a am: f861fa5f -s ours am: 7fd06dd3 -s ours

am skip reason: Merged-In Idfb232952a84e892937352ea183639d78aa61020 with SHA-1 ed0a2c0f is already in history

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



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