am 76820356: Merge "keystore: fix import as other UIDs"

* commit '76820356cc3c9c399717198d7ec4943a96e0b341':
  keystore: fix import as other UIDs