Merge "Grant SharedStorageBackup storage access." into pi-dev
am: 154991434c

Change-Id: I32f99c62f304d4411c665459030fd19d08745aa2