Merge "Add keystore support for testing atoms." am: a2e2bb2945 am: 108a0926cb

Original change: https://android-review.googlesource.com/c/platform/packages/modules/StatsD/+/1682335

Change-Id: I7893d60ebbf812138950a3fe6bd3b3fa4254e47b