[automerger skipped] Merge "Don't show PLMN when connected to WiFi on APM with...

[automerger skipped] Merge "Don't show PLMN when connected to WiFi on APM with WFC off" am: 549368ca am: 3636e051 am: c1c6ce8a -s ours am: cd3161f9 -s ours

am skip reason: Change-Id I881c66ba31ff92489472cca1ff7e6288600fd0e9 with SHA-1 c1e737bc is in history

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

Change-Id: Id1328ce35b1a5826dd735d98b368ca44f12b9f94