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

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

Change-Id: Icd2c42decc94c59189509e3f87115cf847b3a083