Merge "Record important battery usage event into SharedPreference for dump()" into udc-dev