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

Change-Id: Ifab5dfa724f37511315cf0672dcff7121d233322