Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev am: 40c5864445
am: 9c9e70386f

Change-Id: I5e001e9ea92b9fba3698848d7e3fbf418d634af5