Merge "Merge "Persist the one-time permission flag if set" into rvc-dev am: 3df3b53b am: d75b2ad2 am: eef5292e" into rvc-qpr-dev-plus-aosp