Merge "AM: Fix NPE in ActivityMetricsLogger"