am 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"

# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '5c879e48eddfe617125733f2be46854a0266a23b':
  P2PSetting:Avoid p2p_find on group removal event