Merge "Make storage a restricted permission - framework" into qt-dev
am: d21ce79b30

Change-Id: Iaa8b9eca1495bd0c441d0a3cbc60222404544de3