The sample was fixed to use consistent notification ids for notify() and cancel(), so implement the change here too
Merge branch 'fix-ids' into synchronizednotification-stripped-sample

Conflicts:
	SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java