Merge "Add AndroidTest.xml for keystore2_test to support coverage" am: 149dbc595d

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1506392

Change-Id: Ic07a51476dceca8b051204845a57072161e18422