Merge "Merge "Fixes out of bounds error in ActivityMetricsLogger." into...
Merge "Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev am: 2b75d73b am: 660864db am: d7ff864d" into rvc-qpr-dev-plus-aosp am: ef6421b7
Change-Id: I19d42c7962dd4ed3a4a2816ca35dd11b2924f3ed