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

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

Change-Id: I051cdede083ef7ca9469fece68fa89611c8f972c