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: b5c8dcc9 am: 948af421 am: 741eac92

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

Change-Id: I80ccc9d6b3f8013b8d737c0e46e96ed360ce7dfe