Merge "[NAN] Rename setTerminateNotificationEnabled per API review" am: 5d74bf9f95
am: 62be010f2a

Change-Id: I9354e65db8144c01bfbe748f3661f633d5a06c70