tree 73cdd3eeb4ab39bde7d2e7b761abc1fbc311cb35
parent 13121a763b528856f341d994aa54f0d8f0138b75
parent 697d925b091f3f2fc3c549c2b1f4667c0e6d5f66
author Nathan Harold <nharold@google.com> 1594608002 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594608002 +0000

[automerger skipped] Merge "Remove FIXME that getApnSetting should be NonNull" am: a0895c8580 am: a2f46553cf -s ours am: 697d925b09 -s ours

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

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

Change-Id: I6d37ddc82cf2b87b583ed2347d9a055621b99759