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

Change-Id: I3c2e26e66681d6d5f3407635354f9e9b6926c789