Merge "DO NOT MERGE IpConnectivityMetrics: rate limit ApfProgramEvents" into nyc-mr2-dev am: 8b43f6eb02
am: c2d38afdf3  -s ours

Change-Id: I9810fd2fec02285cc8c09ed10cb8386fadd15738