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: 4b231466 am: 07a70e38

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

Change-Id: I69354950f6a3171aa7ef7335df012ce1a1749aad