[automerger skipped] Merge "[DO NOT MERGE] Guard against launching permission backup/restore twice per request" into qt-dev am: 40c5864445 am: 230c3cfaab
am: 45983c90c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibb9c3b9cd93f8b2cec5ba960afdb953c8005bd1f