Merge "WiFiDirectDemo: update permission requirement" am: ef35801792 am: eb22de04c3 am: 056b32b98e
am: 36c69d3251

Change-Id: I0e2efba079ad72257b3c0b17d40b04852025d09f