Merge "Persist the one-time permission flag if set" into rvc-dev am: 3df3b53b am: d75b2ad2 am: eef5292e Change-Id: I53fc189aafe7491ff2349ee6e9e3d4de846252b3