Merge "Don't try to report non-existent stats" am: 8c9b5df98a am: 6c65088897

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

Change-Id: Ifbe880018138218cb65e1281c6c6a23392365c72