Merge "Make one-time permission sessions continue over service restarts" into rvc-dev am: d4d8848f29

Change-Id: I9f89877c4ad47088d7f396dd693c7da1c99c2f97