[automerger skipped] Merge "Display no data notification in certain scenarios" am: 39e56169aa am: 6d858e4d0b am: 31657c4990 -s ours

am skip reason: skip tag Change-Id Ica20169db3c9230172d2cae80a9e6ba3486bfa42 with SHA-1 5badb094f5 is already in history

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

Change-Id: I96d06fba845b375617b22fe4f6d5ea6704039ef9