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

Change-Id: I9bfd828577029c3ebb6b89b6830a5c8d72833768