tree 2be34573e14a30e555ec42b8ae645336cd8937f3
parent 3b25f550420d8f142772a4658d8db00796a7e259
parent a0895c8580a76bded8b52bddeb7a6aaa3c099d08
author Nathan Harold <nharold@google.com> 1594404780 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594404780 +0000

Merge "Remove FIXME that getApnSetting should be NonNull" am: a0895c8580

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

Change-Id: Iadbfe55a4875a4fd05264ac5641ad2465aa490d2