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

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

Change-Id: I41943ab50d50986dd56c3eb89f474751b6cc14cf