Merge "[AWARE] Add discovery window period configuration"
am: 17532ec02e

Change-Id: I62ba5123aafb236d756a4cafe7829717e8e542f9