Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice...
Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev am: 40c58644
am: 9c9e7038
Change-Id: Ice7e1031b38bd9e8e1d0ba238c25a5cd61bf7b0f