Merge "[NAN] Remove failure reason codes from API per API review" am: a7b2fff388
am: 3f1c33c7b8

Change-Id: I49da76b668005d0cc8904794c5eed155697698ef