[automerger skipped] DO NOT MERGE: Add another exception to the nearby-sharing...
[automerger skipped] DO NOT MERGE: Add another exception to the nearby-sharing chip code. am: 3187e48e am: 133e292e -s ours
am skip reason: subject contains skip directive
Change-Id: I5332e311c3b1c5814d9f6908d72b86a6f1b9c3e5