Merge "Merge "Add pullTimeoutDurations to statsdstats" into rvc-dev am: caa0c375 am: 89ce5f1d" into rvc-d1-dev-plus-aosp am: 576ba461 am: d783dd47

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

Change-Id: I48badf46da65793eebfa6eb1c920f2482713a7a9