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

Change-Id: Id226f027b3f60f8e75ec099f4c24a47db9734c79