[automerger skipped] Merge "Don't try to report non-existent stats" am:...

[automerger skipped] Merge "Don't try to report non-existent stats" am: 8c9b5df9 am: 6c650888 am: 7ac3288a -s ours

am skip reason: skip tag Change-Id Ie2eb4d7e2ab562d4436a605bcbdd2ea17517dfc3 with SHA-1 ed271fcf is already in history

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

Change-Id: Idfee1e14923eb67a7a0034fecea7f7e0b7a00c69