[automerger skipped] Merge "Display no data notification in certain scenarios"...

[automerger skipped] Merge "Display no data notification in certain scenarios" am: c301c890 am: fe9372a3 am: 6239dc4f -s ours am: 7425a429 -s ours

am skip reason: skip tag Change-Id Ic6395529e3cbf90fe1f9fbbe06528764fffb92b8 with SHA-1 34dbd6c3 is already in history

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

Change-Id: I1df8958186cf3c6cbcf1e0d65259505f91db4a90