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

Change-Id: Ifbc3b63ce0173c7f066ed3f5a360c0cca53f1814