DO NOT MERGE: Add another exception to the nearby-sharing chip code. am: 3187e48e1f

Change-Id: Id338e3a93630c726dd7c4d68b6c40c7d1a8ef2c3