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

Change-Id: Ibb54bad902c47d719f6511c437dbd51847285ac9