Merge "Merge "Persist the one-time permission flag if set" into rvc-dev am: 3df3b53b8b am: d75b2ad2cd am: eef5292e20" into rvc-qpr-dev-plus-aosp am: 95f0b8c216
Change-Id: Ia1474923a649c71a27c061acb79921b18509fb8c
This commit is contained in: