[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 -s ours

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

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



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