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

Change-Id: I750dd58d7edb581cb9842de27636f770fa370c40