Merge "Keystore2: Fix an error in auth token filtering by age."