Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e
am: 5995579f5f

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.