Merge "Permissions check for Wifi Display configuration" am: f5c32a411c am: 7342bb84cd am: b4663456d4
am: ac2191ebb0  -s ours

Change-Id: I5a03c8b0f8859fc4cefcdf795a7282543c74d708