[automerger skipped] Merge "Add WRITE_APN_SETTINGS to shell identity" into...

[automerger skipped] Merge "Add WRITE_APN_SETTINGS to shell identity" into udc-dev am: e9972527 am: 9d5cb181 -s ours

am skip reason: Merged-In I8acd3d793d2288e0fa315c4d02071ecba4e8d1f6 with SHA-1 36d63008 is already in history

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



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