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: 1858fd8d am: ca00cc94" into rvc-qpr-dev-plus-aosp am: 31916db2
Change-Id: Ia58538596becf70d671833fa24e8a480e2477290