Merge "Throw exception from addServiceAnnouncement impl" am: a179e9f6e7

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

Change-Id: I62f10f5484e0262a3dd1adf12b89ce624ac0caa8