Merge "Rate limit battery external stats collection in takeUidSnapshot(s)." into pi-dev