Merge "Add developer option to disable automatic adb grant revocation" into rvc-dev