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

Change-Id: I2abcd54a9e199c90d44b6e0470858377e23aec3f