Merge "Fix statsd NPE on setPullAtomCallback" into rvc-dev am: 6dfbdb3e2f am: f570f9c46a

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

Change-Id: If7c62456abb01a820e93e8d3dc24401dd33080d9