Merge "[AWARE] Modify the discovery session handle to uint8_t"
am: ff14eb32cd

Change-Id: I5db49744cb78e623e3b1ff2e65d67af69d5b0ed0