Merge "DO NOT MERGE: Add another exception to the nearby-sharing chip code." into qt-qpr1-dev am: 9595ad654b

Change-Id: Ia2fbd7a9ec354a36c672aca5dd645daec3f60d07