Merge "Permissions check for Wifi Display configuration" am: f5c32a41 am: 7342bb84 am: b4663456 am: ac2191eb -s ours Change-Id: I5a03c8b0f8859fc4cefcdf795a7282543c74d708