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

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

Change-Id: If970d5bab626e384baf25d9b194f41b1b89dabf1