Merge "Throw exception from addServiceAnnouncement impl" am: a179e9f6e7 am: 15b0dc5eb3

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

Change-Id: I13727534d36ab9925b9e602b8dc31e2a2b082d63