Merge "Display no data notification in certain scenarios" am: 39e56169aa

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

Change-Id: Ia109fdd98007e1cc6d09fae4b3c09e931e2210e4