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

Change-Id: Ife1cfc7e027b858844a1a251843e0669d0ce3720