DO NOT MERGE: IpConnectivityMetrics: rate limit ApfProgramEvents am: f99a33a1b4  -s ours
am: 6765bc08d0  -s ours

Change-Id: I9e3ca112a654018d9d0b72ba1b0963e7fb678cf0