Merge "Permissions check for Wifi Display configuration" am: f5c32a411c
am: 7342bb84cd

Change-Id: Iac379dace6fd8b01e5bb80a193f79c65ace1f9b9