Merge "Fixes out of bounds error in ActivityMetricsLogger." into rvc-dev am: 2b75d73bb6 am: 1858fd8dd1
am: ca00cc940a
Change-Id: Iea6db26d1dd57ee8baef9357ee8b32504572184c
This commit is contained in: