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

Change-Id: I42f6363f3037da833e70d31f8cda096dfe5832c8