[automerger skipped] Merge "Update NETWORK_TYPE_NR docs" am: a49fb9831e am: 4f26bb37a1 am: af8cf941d6 am: 519153d67a -s ours

am skip reason: Change-Id I48259a0dce53b7a6a02c5e211b0ef7fc3d2aea30 with SHA-1 2e778fdc5e is in history

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

Change-Id: Ia653b09904a13f7076ced0b570a4881fa9437bec