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

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

Change-Id: I9343b70a19265b86568082d94adc009d421b5c5d