Merge "Add log for shouldShowBatteryAttributionList() checking"