DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents am: 97d10ffcad
am: b37d43b83c  -s ours

Change-Id: Ie3547d74cdbf3a5333f3951b9375b00224c2ecd0