Merge "Whitelist all restricted permissions on sideload" into qt-dev
am: 04cb6d1ccc

Change-Id: I13556665d99450757a999d35e40d830bcbe2cf15