Merge "Add metric for battery tip action" into pi-dev
am: 1817c1329f

Change-Id: I3cf8b9686f68c7c5cd8d1701a1daeb63edefe796