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

Change-Id: I435c5377d7897cee20bba7a352eb55e85e996673