Merge "Hide emergency APN in user settings" am: 6c553c0c5c am: 90a326dc3c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1900491

Change-Id: I8ed9aa66573560824dac6c09295effecd7ee190d