Merge "[AWARE] Add global NAN RTT enable/disable flag"