Merge "Restricted permission whitelisted by default" into qt-dev
am: 650cb05202

Change-Id: Idcdec83acae25d83014b829e9d714f92462b3cac