DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip am: c5dffc9a4a

Change-Id: I71f241c27feff278d71b4d70751ce94378eb37a6