[automerger skipped] Merge "Show the nearby chip for images and files too."...

[automerger skipped] Merge "Show the nearby chip for images and files too." am: bd8e5ae3 am: 6ff4300a -s ours am: 01914942 -s ours am: 86050129 -s ours am: 0263d0dd -s ours

am skip reason: Change-Id If0c0b754a066b0ec439a866de3eae84caca7b793 with SHA-1 b18b59fd is in history

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

Change-Id: I9a9345cc22820066fb7e31197537d1a7c0a698c5