Merge "Add permissions to control and configure wifi display." into jb-mr1-dev