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

Change-Id: I28a4353dfeeeda31774e72a6c59c36d3c966e8f2