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

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

Change-Id: I214ca8cb07535dbe33be18aa9a49d31811451ff5
tree: 8f18564689d623fcf221ff0e48cc7a1887614898
  1. Tethering/