Merge "WiFiDirectDemo: update permission requirement" am: ef35801792
am: eb22de04c3

Change-Id: I530786a33a1521510469a1f4fbb1105af494f9c3