[automerger skipped] [DO NOT MERGE] Guard against launching permission backup/restore twice per request am: 8c2fb0ea1e am: 2f27997760
am: 9099351807 -s ours
am skip reason: subject contains skip directive

Change-Id: I8218ac48b042ff0f25e473948ec954695d376679