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

Change-Id: Id7370d4945d74bf6808afa67a812b4327347f6aa