am 64b0062a: Merge "Load fewer classes when AndroidKeyStore provider is installed."

* commit '64b0062a373102f83837faade20b469685758139':
  Load fewer classes when AndroidKeyStore provider is installed.