Merge "Show the nearby chip for images and files too." into rvc-dev am:...

Merge "Show the nearby chip for images and files too." into rvc-dev am: bb2d9a52 am: fe25cc3b am: 10408630 am: 2cf58630

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

Change-Id: I111c31124087f17ad5c397d3b10d465ed32ad102