[automerger skipped] Merge "Remove FIXME that getApnSetting should be NonNull"...

[automerger skipped] Merge "Remove FIXME that getApnSetting should be NonNull" am: a0895c85 am: a2f46553 -s ours am: 697d925b -s ours am: 3f8242be -s ours am: e25df2cc -s ours

am skip reason: Change-Id Ifd80f2859e4a090225aab1b3a483325d654a2412 with SHA-1 4005f21d is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1261865

Change-Id: I859c08c25d50a9ea56be57b5548d0db9a7e0e54b