Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev am: 2b75d73bb6 am: 1858fd8dd1 am: 17936d4604 am: edeb79cec8

Change-Id: I0a2d134e13a75bca2b9907ff6ba7030552d3fa75