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

Change-Id: I444be0c73cb55da6eafb0b2f1489bc1dbb66c34d