[automerger skipped] DO NOT MERGE: Allow nearby sharing to substitute name & icon in chip am: c5dffc9a4a am: 7b1b93935e -s ours
am skip reason: subject contains skip directive

Change-Id: I4ac049ba05a649e6855df55f3926d57fb4b511c3