Merge "Show the nearby chip for images and files too." am: bd8e5ae31c

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

Change-Id: I38f79f585072673d40ae8d3dab72cdd838b92c2c