[automerger skipped] Merge "[SP25] Rename functions that add Entry conditionally" am: 2a17338e44 am: d1c1d3554e -s ours am: 4f707d613f -s ours am: b7c3feed44 -s ours am: 3c69be5dc1 -s ours

am skip reason: Change-Id I9495a198cf247e6c79100f7ac1edcea370b071de with SHA-1 abb0596a0a is in history

Change-Id: I0a3f09c46eef66ec405a98c213ed1fa64638dd4c
tree: ec45c954978b802c7056fd2ee926ceeb383eee78
  1. Tethering/