Merge "Update keystore-statsd proxy for logging RkpPoolStats atom." into sc-dev am: 4def4bdfcb

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15160850

Change-Id: I02d58148adbbcb01bbf5eebf81164af83df2ae7b