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

Change-Id: I50eba3f8c2171c511e0b1ecd3d0e605956e97d24