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

Change-Id: I7cccd8c9e725427eab9f1f4d0b5683354432117d