[automerger skipped] Merge "Add is_ntn field" into 24D1-dev am: 7b1a3bd6 -s ours

am skip reason: Merged-In I53cfdae62d132c0561f2245d7f8f8dfd171534e5 with SHA-1 827fbf64 is already in history

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



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