[automerger skipped] Merge "DO NOT MERGE: Add another exception to the...

[automerger skipped] Merge "DO NOT MERGE: Add another exception to the nearby-sharing chip code." into qt-qpr1-dev am: 9595ad65 am: 80eaa49d -s ours
am skip reason: subject contains skip directive

Change-Id: I1637e680969777741e26ce70a63e1e778c7d7971