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

Change-Id: Ib98eca626425d48ff9adca17237d7c85ad655012