[automerger skipped] Merge "Push the latency histograms to statsd" am: d5dd055c am: b282f513 -s ours

am skip reason: Merged-In I0b8db72c0cb3b285177bbe402ce37639c468dbf3 with SHA-1 10049708 is already in history

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

Change-Id: Ieb0e1cec3c1c7ddf5bf4a1d5943601bd596c8e18