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

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