Merge "Rename addServiceAnnouncement-related methods" am: 6f68b4bf53

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1311925

Change-Id: I505ebfd17d8ae54b3e61b8fee45e531361953076