Merge "[NAN] Expose NAN characteristics as an API"
am: f12c6e4f5e

Change-Id: I842c7503eeb6d70c941e3097dae0207661cc906e