Merge "Ensure adb key store is instantiated before revoking grants" into qt-qpr1-dev