Merge "Pull Keystore2CrashStats Atom." into sc-dev am: 55d8797628

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

Change-Id: I03ffa33a1684ba205e976b23c1dca7c778375889