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

Change-Id: I984bec4b050f93486030a2e7c6320b53d990f776