Merge "Persist the one-time permission flag if set" into rvc-dev am: 3df3b53b am: 70f3a278 am: 119daf81 Change-Id: I786b00062584fe8b331238d864bf94650b19dba5