Merge "Revoke 'always allow' adb grants after period of inactivity"