Merge "Remove APN from log" into sc-qpr1-dev am: e54e251a4e am: 386712d6da am: da6f84e664

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

Change-Id: Ica1177e2e206e204495a9b6562bbf8a9ed6918a0