Merge "Check if APN setting is null" into tm-dev am: d4513489 am: c5d997be

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/17507948



Change-Id: Ia0d555063eeca7617b28a91047c9ca6a6f1d9013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>